Commit 694a464e authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] uml: kconfigs

kconfig sanitized around drivers/net
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cc70a40b
...@@ -22,6 +22,9 @@ config SBUS ...@@ -22,6 +22,9 @@ config SBUS
config PCI config PCI
bool bool
config PCMCIA
bool
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
......
...@@ -2313,13 +2313,11 @@ config S2IO_NAPI ...@@ -2313,13 +2313,11 @@ config S2IO_NAPI
endmenu endmenu
if !UML
source "drivers/net/tokenring/Kconfig" source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig" source "drivers/net/wireless/Kconfig"
source "drivers/net/pcmcia/Kconfig" source "drivers/net/pcmcia/Kconfig"
endif
source "drivers/net/wan/Kconfig" source "drivers/net/wan/Kconfig"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
menu "Token Ring devices" menu "Token Ring devices"
depends on NETDEVICES depends on NETDEVICES && !UML
# So far, we only have PCI, ISA, and MCA token ring devices # So far, we only have PCI, ISA, and MCA token ring devices
config TR config TR
......
...@@ -356,7 +356,7 @@ config PCI_HERMES ...@@ -356,7 +356,7 @@ config PCI_HERMES
config ATMEL config ATMEL
tristate "Atmel at76c50x chipset 802.11b support" tristate "Atmel at76c50x chipset 802.11b support"
depends on NET_RADIO depends on NET_RADIO && (PCI || PCMCIA)
select FW_LOADER select FW_LOADER
select CRC32 select CRC32
---help--- ---help---
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment