Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/um/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ config SBUS 
config PCI

	bool



config PCMCIA

	bool



config GENERIC_CALIBRATE_DELAY

	bool

	default y

drivers/net/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/net/tokenring/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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---