Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 78fb619..e6ff302 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -1,3 +1,8 @@
+config DEFCONFIG_LIST
+       string
+       option defconfig_list
+       default "arch/$ARCH/defconfig"
+
 # UML uses the generic IRQ sugsystem
 config GENERIC_HARDIRQS
        bool
@@ -11,6 +16,9 @@ config MMU
        bool
        default y
 
+config NO_IOMEM
+       def_bool y
+
 mainmenu "Linux/Usermode Kernel Configuration"
 
 config ISA
@@ -36,12 +44,17 @@ config LOCKDEP_SUPPORT
 
 config STACKTRACE_SUPPORT
        bool
-       default y
+       default n
 
 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
@@ -52,6 +65,7 @@ menu "UML-specific options"
 config MODE_TT
        bool "Tracing thread support (DEPRECATED)"
        default n
+       depends on BROKEN
        help
        This option controls whether tracing thread support is compiled
        into UML. This option is largely obsolete, given that skas0 provides
@@ -263,7 +277,9 @@ config HIGHMEM
 
 config KERNEL_STACK_ORDER
        int "Kernel stack size order"
-       default 2
+       default 1 if 64BIT
+       range 1 10 if 64BIT
+       default 0 if !64BIT
        help
        This option determines the size of UML kernel stacks.  They will
        be 1 << order pages.  The default is OK unless you're running Valgrind
@@ -306,21 +322,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"