[PATCH 6/10] Sanitize net Kconfigs

[Jeff Dike]

From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
uml: kconfig sanitized around drivers/net
 
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

 arch/um/Kconfig               |    3 +++
 drivers/net/Kconfig           |    2 --
 drivers/net/tokenring/Kconfig |    2 +-
 drivers/net/wireless/Kconfig  |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

Index: linux-2.6.16-mm/arch/um/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/arch/um/Kconfig	2006-03-23 16:40:20.000000000 -0500
+++ linux-2.6.16-mm/arch/um/Kconfig	2006-03-28 09:34:46.000000000 -0500
@@ -22,6 +22,9 @@ config SBUS
 config PCI
 	bool
 
+config PCMCIA
+	bool
+
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
Index: linux-2.6.16-mm/drivers/net/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/Kconfig	2006-03-28 09:30:43.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/Kconfig	2006-03-28 09:34:46.000000000 -0500
@@ -2313,13 +2313,11 @@ config S2IO_NAPI
 
 endmenu
 
-if !UML
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"
-endif
 
 source "drivers/net/wan/Kconfig"
 
Index: linux-2.6.16-mm/drivers/net/tokenring/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/tokenring/Kconfig	2006-03-28 09:30:43.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/tokenring/Kconfig	2006-03-28 09:34:46.000000000 -0500
@@ -3,7 +3,7 @@
 #
 
 menu "Token Ring devices"
-	depends on NETDEVICES
+	depends on NETDEVICES && !UML
 
 # So far, we only have PCI, ISA, and MCA token ring devices
 config TR
Index: linux-2.6.16-mm/drivers/net/wireless/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/wireless/Kconfig	2006-03-28 09:30:44.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/wireless/Kconfig	2006-03-28 09:34:46.000000000 -0500
@@ -359,7 +359,7 @@ config PCI_HERMES
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on NET_RADIO
+      depends on NET_RADIO && (PCI || PCMCIA)
       select FW_LOADER
       select CRC32
        ---help---

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/