openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Al Viro 2006-03-31 02:30:14 -08:00 committed by Linus Torvalds
parent cc70a40b5e
commit 694a464e19
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/um/Kconfig
View File

@ -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

2
drivers/net/Kconfig
View File

@ -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"

2
drivers/net/tokenring/Kconfig
View File

@ -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

2
drivers/net/wireless/Kconfig
View File

@ -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---