tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Al Viro and committed by
Linus Torvalds 694a464e cc70a40b

+5 -4
+3
arch/um/Kconfig
··· 22 22 config PCI 23 23 bool 24 24 25 + config PCMCIA 26 + bool 27 + 25 28 config GENERIC_CALIBRATE_DELAY 26 29 bool 27 30 default y
-2
drivers/net/Kconfig
··· 2313 2313 2314 2314 endmenu 2315 2315 2316 - if !UML 2317 2316 source "drivers/net/tokenring/Kconfig" 2318 2317 2319 2318 source "drivers/net/wireless/Kconfig" 2320 2319 2321 2320 source "drivers/net/pcmcia/Kconfig" 2322 - endif 2323 2321 2324 2322 source "drivers/net/wan/Kconfig" 2325 2323
+1 -1
drivers/net/tokenring/Kconfig
··· 3 3 # 4 4 5 5 menu "Token Ring devices" 6 - depends on NETDEVICES 6 + depends on NETDEVICES && !UML 7 7 8 8 # So far, we only have PCI, ISA, and MCA token ring devices 9 9 config TR
+1 -1
drivers/net/wireless/Kconfig
··· 356 356 357 357 config ATMEL 358 358 tristate "Atmel at76c50x chipset 802.11b support" 359 - depends on NET_RADIO 359 + depends on NET_RADIO && (PCI || PCMCIA) 360 360 select FW_LOADER 361 361 select CRC32 362 362 ---help---