mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
[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:
parent
cc70a40b5e
commit
694a464e19
4 changed files with 5 additions and 4 deletions
|
@ -22,6 +22,9 @@ config SBUS
|
|||
config PCI
|
||||
bool
|
||||
|
||||
config PCMCIA
|
||||
bool
|
||||
|
||||
config GENERIC_CALIBRATE_DELAY
|
||||
bool
|
||||
default y
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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---
|
||||
|
|
Loading…
Reference in a new issue