Use menuconfig objects: ISDN: CONFIG_ISDN_CAPI

Transform "depends on" into a simpler if-endif block style dependency.

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, 6 insertions, 7 deletions

diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig
index 8ffdb4f73ee5..fe6c67ced33f 100644
--- a/drivers/isdn/hardware/avm/Kconfig
+++ b/drivers/isdn/hardware/avm/Kconfig
@@ -3,7 +3,6 @@
 #
 
 menu "Active AVM cards"
-        depends on ISDN_CAPI!=n
 
 config CAPI_AVM
         bool "Support AVM cards"
@@ -12,13 +11,13 @@ config CAPI_AVM
 
 config ISDN_DRV_AVMB1_B1ISA
         tristate "AVM B1 ISA support"
-        depends on CAPI_AVM && ISDN_CAPI && ISA
+        depends on CAPI_AVM && 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 && ISDN_CAPI && PCI
+        depends on CAPI_AVM && PCI
         help
           Enable support for the PCI version of the AVM B1 card.
 
@@ -30,14 +29,14 @@ config ISDN_DRV_AVMB1_B1PCIV4
 
 config ISDN_DRV_AVMB1_T1ISA
         tristate "AVM T1/T1-B ISA support"
-        depends on CAPI_AVM && ISDN_CAPI && ISA
+        depends on CAPI_AVM && 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 && ISDN_CAPI
+        depends on CAPI_AVM
         help
           Enable support for the PCMCIA version of the AVM B1 card.
 
@@ -50,14 +49,14 @@ config ISDN_DRV_AVMB1_AVM_CS
 
 config ISDN_DRV_AVMB1_T1PCI
         tristate "AVM T1/T1-B PCI support"
-        depends on CAPI_AVM && ISDN_CAPI && PCI
+        depends on CAPI_AVM && 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 && ISDN_CAPI && PCI
+        depends on CAPI_AVM && PCI
         help
           Enable support for the AVM C4/C2 PCI cards.
           These cards handle 4/2 BRI ISDN lines (8/4 channels).