Commit 8a903be1 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[TR]: Use menuconfig objects. 



Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42859007

drivers/net/tokenring/Kconfig

+16 −17
Original line number Original line Diff line number Diff line
@@ -2,12 +2,10 @@ 
# Token Ring driver configuration

# Token Ring driver configuration

#

#





menu "Token Ring devices"

	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

menuconfig TR

	bool "Token Ring driver support"

	bool "Token Ring driver support"

	depends on NETDEVICES && !UML

	depends on (PCI || ISA || MCA || CCW)

	depends on (PCI || ISA || MCA || CCW)

	select LLC

	select LLC

	help

	help
@@ -20,9 +18,11 @@ config TR 
	  from <http://www.tldp.org/docs.html#howto>. Most people can

	  from <http://www.tldp.org/docs.html#howto>. Most people can

	  say N here.

	  say N here.





if TR



config IBMTR

config IBMTR

	tristate "IBM Tropic chipset based adapter support"

	tristate "IBM Tropic chipset based adapter support"

	depends on TR && (ISA || MCA)

	depends on ISA || MCA

	---help---

	---help---

	  This is support for all IBM Token Ring cards that don't use DMA. If

	  This is support for all IBM Token Ring cards that don't use DMA. If

	  you have such a beast, say Y and read the Token-Ring mini-HOWTO,

	  you have such a beast, say Y and read the Token-Ring mini-HOWTO,
@@ -36,7 +36,7 @@ config IBMTR 




config IBMOL

config IBMOL

	tristate "IBM Olympic chipset PCI adapter support"

	tristate "IBM Olympic chipset PCI adapter support"

	depends on TR && PCI

	depends on PCI

	---help---

	---help---

	  This is support for all non-Lanstreamer IBM PCI Token Ring Cards.

	  This is support for all non-Lanstreamer IBM PCI Token Ring Cards.

	  Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II

	  Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II
@@ -54,7 +54,7 @@ config IBMOL 




config IBMLS

config IBMLS

	tristate "IBM Lanstreamer chipset PCI adapter support"

	tristate "IBM Lanstreamer chipset PCI adapter support"

	depends on TR && PCI && !64BIT

	depends on PCI && !64BIT

	help

	help

	  This is support for IBM Lanstreamer PCI Token Ring Cards.

	  This is support for IBM Lanstreamer PCI Token Ring Cards.
@@ -66,7 +66,7 @@ config IBMLS 




config 3C359

config 3C359

	tristate "3Com 3C359 Token Link Velocity XL adapter support"

	tristate "3Com 3C359 Token Link Velocity XL adapter support"

	depends on TR && PCI

	depends on PCI

	---help---

	---help---

	  This is support for the 3Com PCI Velocity XL cards, specifically

	  This is support for the 3Com PCI Velocity XL cards, specifically

	  the 3Com 3C359, please note this is not for the 3C339 cards, you

	  the 3Com 3C359, please note this is not for the 3C339 cards, you
@@ -84,7 +84,7 @@ config 3C359 




config TMS380TR

config TMS380TR

	tristate "Generic TMS380 Token Ring ISA/PCI adapter support"

	tristate "Generic TMS380 Token Ring ISA/PCI adapter support"

	depends on TR && (PCI || ISA && ISA_DMA_API || MCA)

	depends on PCI || ISA && ISA_DMA_API || MCA

	select FW_LOADER

	select FW_LOADER

	---help---

	---help---

	  This driver provides generic support for token ring adapters

	  This driver provides generic support for token ring adapters
@@ -108,7 +108,7 @@ config TMS380TR 




config TMSPCI

config TMSPCI

	tristate "Generic TMS380 PCI support"

	tristate "Generic TMS380 PCI support"

	depends on TR && TMS380TR && PCI

	depends on TMS380TR && PCI

	---help---

	---help---

	  This tms380 module supports generic TMS380-based PCI cards.

	  This tms380 module supports generic TMS380-based PCI cards.
@@ -123,7 +123,7 @@ config TMSPCI 




config SKISA

config SKISA

	tristate "SysKonnect TR4/16 ISA support"

	tristate "SysKonnect TR4/16 ISA support"

	depends on TR && TMS380TR && ISA

	depends on TMS380TR && ISA

	help

	help

	  This tms380 module supports SysKonnect TR4/16 ISA cards.

	  This tms380 module supports SysKonnect TR4/16 ISA cards.
@@ -135,7 +135,7 @@ config SKISA 




config PROTEON

config PROTEON

	tristate "Proteon ISA support"

	tristate "Proteon ISA support"

	depends on TR && TMS380TR && ISA

	depends on TMS380TR && ISA

	help

	help

	  This tms380 module supports Proteon ISA cards.

	  This tms380 module supports Proteon ISA cards.
@@ -148,7 +148,7 @@ config PROTEON 




config ABYSS

config ABYSS

	tristate "Madge Smart 16/4 PCI Mk2 support"

	tristate "Madge Smart 16/4 PCI Mk2 support"

	depends on TR && TMS380TR && PCI

	depends on TMS380TR && PCI

	help

	help

	  This tms380 module supports the Madge Smart 16/4 PCI Mk2

	  This tms380 module supports the Madge Smart 16/4 PCI Mk2

	  cards (51-02).

	  cards (51-02).
@@ -158,7 +158,7 @@ config ABYSS 




config MADGEMC

config MADGEMC

	tristate "Madge Smart 16/4 Ringnode MicroChannel"

	tristate "Madge Smart 16/4 Ringnode MicroChannel"

	depends on TR && TMS380TR && MCA

	depends on TMS380TR && MCA

	help

	help

	  This tms380 module supports the Madge Smart 16/4 MC16 and MC32

	  This tms380 module supports the Madge Smart 16/4 MC16 and MC32

	  MicroChannel adapters.

	  MicroChannel adapters.
@@ -168,7 +168,7 @@ config MADGEMC 




config SMCTR

config SMCTR

	tristate "SMC ISA/MCA adapter support"

	tristate "SMC ISA/MCA adapter support"

	depends on TR && (ISA || MCA_LEGACY) && (BROKEN || !64BIT)

	depends on (ISA || MCA_LEGACY) && (BROKEN || !64BIT)

	---help---

	---help---

	  This is support for the ISA and MCA SMC Token Ring cards,

	  This is support for the ISA and MCA SMC Token Ring cards,

	  specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A

	  specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
@@ -182,5 +182,4 @@ config SMCTR 
	  To compile this driver as a module, choose M here: the module will be

	  To compile this driver as a module, choose M here: the module will be

	  called smctr.

	  called smctr.





endmenu

endif # TR