X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fum%2FKconfig;h=b9c0f307a8fa7ee9b8e866b0416c0764b88d7630;hb=7a13e932281e7042a592f4f14db0b348199e7aac;hp=d32a80e6668c08c008714d8c0ef1f26ce6a4645b;hpb=706b75ddbe36d20d071424f9867385c319b67f8d;p=powerpc.git

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index d32a80e666..b9c0f307a8 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
@@ -41,7 +44,7 @@ config LOCKDEP_SUPPORT
 
 config STACKTRACE_SUPPORT
 	bool
-	default y
+	default n
 
 config GENERIC_CALIBRATE_DELAY
 	bool
@@ -317,21 +320,7 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-menu "SCSI support"
-depends on BROKEN
-
-config SCSI
-	tristate "SCSI support"
-
-# This gives us free_dma, which scsi.c wants.
-config GENERIC_ISA_DMA
-	bool
-	depends on SCSI
-	default y
-
-source "arch/um/Kconfig.scsi"
-
-endmenu
+source "drivers/scsi/Kconfig"
 
 source "drivers/md/Kconfig"