Commit 0bbadafd authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 009c9aa5

arch/um/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/um/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/input/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#



menu "Input device support"

	depends on !UML



config INPUT

	tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT

drivers/input/gameport/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#

config GAMEPORT

	tristate "Gameport support"

	depends on !UML

	help

	  Gameport support is for the standard 15-pin PC gameport. If you

	  have a joystick, gamepad, gameport card, a soundcard with a gameport

drivers/input/joystick/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#

menuconfig INPUT_JOYSTICK

	bool "Joysticks/Gamepads"

	depends on !UML

	help

	  If you have a joystick, 6dof controller, gamepad, steering wheel,

	  weapon control system or something like that you can say Y here