Use menuconfig objects: ISDN: CONFIG_CAPI_AVM

Transform Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to enter
the menu first.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig
index fe6c67ced33f..5dbcbe3a54a6 100644
--- a/drivers/isdn/hardware/avm/Kconfig
+++ b/drivers/isdn/hardware/avm/Kconfig
@@ -2,22 +2,22 @@
 # ISDN AVM drivers
 #
 
-menu "Active AVM cards"
-
-config CAPI_AVM
-        bool "Support AVM cards"
+menuconfig CAPI_AVM
+        bool "Active AVM cards"
         help
           Enable support for AVM active ISDN cards.
 
+if CAPI_AVM
+
 config ISDN_DRV_AVMB1_B1ISA
         tristate "AVM B1 ISA support"
-        depends on CAPI_AVM && ISA
+        depends on ISA
         help
           Enable support for the ISA version of the AVM B1 card.
 
 config ISDN_DRV_AVMB1_B1PCI
         tristate "AVM B1 PCI support"
-        depends on CAPI_AVM && PCI
+        depends on PCI
         help
           Enable support for the PCI version of the AVM B1 card.
 
@@ -29,14 +29,13 @@ config ISDN_DRV_AVMB1_B1PCIV4
 
 config ISDN_DRV_AVMB1_T1ISA
         tristate "AVM T1/T1-B ISA support"
-        depends on CAPI_AVM && ISA
+        depends on ISA
         help
           Enable support for the AVM T1 T1B card.
           Note: This is a PRI card and handle 30 B-channels.
 
 config ISDN_DRV_AVMB1_B1PCMCIA
         tristate "AVM B1/M1/M2 PCMCIA support"
-        depends on CAPI_AVM
         help
           Enable support for the PCMCIA version of the AVM B1 card.
 
@@ -49,17 +48,16 @@ config ISDN_DRV_AVMB1_AVM_CS
 
 config ISDN_DRV_AVMB1_T1PCI
         tristate "AVM T1/T1-B PCI support"
-        depends on CAPI_AVM && PCI
+        depends on PCI
         help
           Enable support for the AVM T1 T1B card.
           Note: This is a PRI card and handle 30 B-channels.
 
 config ISDN_DRV_AVMB1_C4
         tristate "AVM C4/C2 support"
-        depends on CAPI_AVM && PCI
+        depends on PCI
         help
           Enable support for the AVM C4/C2 PCI cards.
           These cards handle 4/2 BRI ISDN lines (8/4 channels).
 
-endmenu
-
+endif # CAPI_AVM