Some configuration options are known not to compile. So then make them
depend on CONFIG_BROKEN.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---
uml-linux-2.6.8.1-paolo/arch/um/Kconfig | 27 +++++++++++++++-----------
uml-linux-2.6.8.1-paolo/arch/um/Kconfig_block | 1
uml-linux-2.6.8.1-paolo/arch/um/Kconfig_net | 2 -
3 files changed, 18 insertions(+), 12 deletions(-)
diff -puN arch/um/Kconfig~uml-mark_broken_configs arch/um/Kconfig
--- uml-linux-2.6.8.1/arch/um/Kconfig~uml-mark_broken_configs 2004-08-29 14:40:49.316714496 +0200
+++ uml-linux-2.6.8.1-paolo/arch/um/Kconfig 2004-08-29 14:40:49.320713888 +0200
@@ -155,6 +155,7 @@ config HOST_2G_2G
config UML_SMP
bool "Symmetric multi-processing support"
+ depends on BROKEN
help
This option enables UML SMP support. UML implements virtual SMP by
allowing as many processes to run simultaneously on the host as
@@ -203,6 +204,7 @@ config KERNEL_HALF_GIGS
config HIGHMEM
bool "Highmem support"
+ depends on BROKEN
config KERNEL_STACK_ORDER
int "Kernel stack size order"
@@ -249,25 +251,28 @@ source "crypto/Kconfig"
source "lib/Kconfig"
-menu "SCSI support"
+if BROKEN
+ menu "SCSI support"
-config SCSI
- tristate "SCSI support"
+ config SCSI
+ tristate "SCSI support"
# This gives us free_dma, which scsi.c wants.
-config GENERIC_ISA_DMA
- bool
- depends on SCSI
- default y
+ config GENERIC_ISA_DMA
+ bool
+ depends on SCSI
+ default y
-source "arch/um/Kconfig_scsi"
+ source "arch/um/Kconfig_scsi"
-endmenu
+ endmenu
+endif
source "drivers/md/Kconfig"
-source "drivers/mtd/Kconfig"
-
+if BROKEN
+ source "drivers/mtd/Kconfig"
+endif
menu "Kernel hacking"
diff -puN arch/um/Kconfig_block~uml-mark_broken_configs arch/um/Kconfig_block
--- uml-linux-2.6.8.1/arch/um/Kconfig_block~uml-mark_broken_configs 2004-08-29 14:40:49.317714344 +0200
+++ uml-linux-2.6.8.1-paolo/arch/um/Kconfig_block 2004-08-29 14:40:49.320713888 +0200
@@ -64,6 +64,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 -puN arch/um/Kconfig_net~uml-mark_broken_configs arch/um/Kconfig_net
--- uml-linux-2.6.8.1/arch/um/Kconfig_net~uml-mark_broken_configs 2004-08-29 14:40:49.318714192 +0200
+++ uml-linux-2.6.8.1-paolo/arch/um/Kconfig_net 2004-08-29 14:40:49.321713736 +0200
@@ -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
_