[PATCH] uml: kconfigs

kconfig sanitized around drivers/net

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@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 5982fe2753e0286382aa07ba35ba831b98cb2285..05fbb20636cbe0126b1c86d6f02e5987533e6e82 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -22,6 +22,9 @@ config SBUS
 config PCI
        bool
 
+config PCMCIA
+       bool
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e20b849a22e8e59a4f3fb06304b1f190d840c050..bdaaad8f2123d5410c1985ceb526e200bb1958e6 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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"
 

diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index e4cfc80b283b74a4ead414593340520f5be9554c..99c4c1922f190f2bd9d81025ad0697c3dc939347 100644 (file)
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -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

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index f85e301900088ac69cfe2c50ee37a0c26e91c151..bad09ebdb50b9622d6b635a9301a886d98d878f5 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -356,7 +356,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---