diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-03-05 13:19:51 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-06-17 21:44:50 +0200 |
| commit | 0bbadafdc49d11a1836e5946f517d18cceaea6c8 (patch) | |
| tree | ec7d81b3235f900c9e508638db2c29d9807f25d8 /arch/um | |
| parent | 009c9aa5be652675a06d5211e1640e02bbb1c33d (diff) | |
| download | linux-stable-0bbadafdc49d11a1836e5946f517d18cceaea6c8.tar.gz linux-stable-0bbadafdc49d11a1836e5946f517d18cceaea6c8.tar.bz2 linux-stable-0bbadafdc49d11a1836e5946f517d18cceaea6c8.zip | |
um: allow disabling NO_IOMEM
Adjust the kconfig a little to allow disabling NO_IOMEM in UML. To
make an "allyesconfig" with CONFIG_NO_IOMEM=n build, adjust a few
Kconfig things elsewhere and add dummy asm/fb.h and asm/vga.h files.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Kconfig | 4 | ||||
| -rw-r--r-- | arch/um/include/asm/Kbuild | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 57cfd9a1c082..e72b4b393367 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -27,6 +27,10 @@ config MMU default y config NO_IOMEM + bool "disable IOMEM" if EXPERT + default y + +config NO_IOPORT_MAP def_bool y config ISA diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index d7492e5a1bbb..10b7228b3aee 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -7,6 +7,7 @@ generic-y += device.h generic-y += emergency-restart.h generic-y += exec.h generic-y += extable.h +generic-y += fb.h generic-y += ftrace.h generic-y += futex.h generic-y += hw_irq.h @@ -27,3 +28,4 @@ generic-y += trace_clock.h generic-y += word-at-a-time.h generic-y += kprobes.h generic-y += mm_hooks.h +generic-y += vga.h |