[PATCH] uml: mark broken configs

Some configuration options are known not to compile.  So then make them depend
on CONFIG_BROKEN.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index e63389482650af7f4d897702b5a2de11d29f4375..78b22b893e34ec48c6bf839969bc1ec9ac8d59e8 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -143,7 +143,6 @@ config SMP
         will appear to be running simultaneously.  If the host is a
         multiprocessor, then UML processes may run simultaneously, depending
         on the host scheduler.
-        CONFIG_SMP will be set to whatever this option is set to.
         It is safe to leave this unchanged.
 
 config NR_CPUS
@@ -179,6 +178,7 @@ config KERNEL_HALF_GIGS
 
 config HIGHMEM
        bool "Highmem support"
+       depends on BROKEN
 
 config KERNEL_STACK_ORDER
        int "Kernel stack size order"
@@ -226,6 +226,7 @@ source "crypto/Kconfig"
 source "lib/Kconfig"
 
 menu "SCSI support"
+depends on BROKEN
 
 config SCSI
        tristate "SCSI support"
@@ -242,6 +243,8 @@ endmenu
 
 source "drivers/md/Kconfig"
 
-source "drivers/mtd/Kconfig"
+if BROKEN
+       source "drivers/mtd/Kconfig"
+endif
 
 source "arch/um/Kconfig.debug"

diff --git a/arch/um/Kconfig_block b/arch/um/Kconfig_block
index ce872e1a6375f94d6ca6c257a1e453cab78770e1..8f2ba090c73fa1aad6c4dec7ceb720d122e7b7ae 100644 (file)
--- a/arch/um/Kconfig_block
+++ b/arch/um/Kconfig_block
@@ -54,6 +54,7 @@ config BLK_DEV_INITRD
 
 config MMAPPER
        tristate "Example IO memory driver"
+       depends on BROKEN
        help
         The User-Mode Linux port can provide support for IO Memory
         emulation with this option.  This allows a host file to be

diff --git a/arch/um/Kconfig_net b/arch/um/Kconfig_net
index 94c6bf0986440a74dcc3d95b81f3a056a19c2b3c..1c2f9a70d91db3aa52187dc3972610cb78ad7626 100644 (file)
--- a/arch/um/Kconfig_net
+++ b/arch/um/Kconfig_net
@@ -135,7 +135,7 @@ config UML_NET_MCAST
 
 config UML_NET_PCAP
        bool "pcap transport"
-       depends on UML_NET
+       depends on UML_NET && BROKEN
        help
        The pcap transport makes a pcap packet stream on the host look
        like an ethernet device inside UML.  This is useful for making