X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=arch%2Fum%2FKconfig;h=b3a21ba77cd2a40f9784d3e5d86fe53dfb1fed67;hb=0e8cd28a084691587549630dce728661401d343b;hp=5ac1f2963ae383e391cb601c730ed645e0707b6a;hpb=73441c665bee555526b1cf3eef603a0cff0b7e19;p=mv-sheeva.git

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 5ac1f2963ae..b3a21ba77cd 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -16,6 +16,9 @@ config MMU
 	bool
 	default y
 
+config NO_IOMEM
+	def_bool y
+
 mainmenu "Linux/Usermode Kernel Configuration"
 
 config ISA
@@ -47,6 +50,11 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
+config GENERIC_BUG
+	bool
+	default y
+	depends on BUG
+
 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
 	bool