aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@linux01.gwdg.de>2007-07-17 07:04:20 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:05 -0400
commitdf19434cc268e207d1beb4dc7be3420888faef09 (patch)
treeb2640cfe4c321ca754dd1eba3938420f194c5279
parentcf4d5f1d50e44d36d459344da3c8f226b3933aeb (diff)
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>
-rw-r--r--drivers/isdn/Kconfig4
-rw-r--r--drivers/isdn/capi/Kconfig7
-rw-r--r--drivers/isdn/hardware/Kconfig1
-rw-r--r--drivers/isdn/hardware/avm/Kconfig13
-rw-r--r--drivers/isdn/hardware/eicon/Kconfig3
5 files changed, 13 insertions, 15 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index a3c9a0343129..cf906c8cee4d 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -57,8 +57,12 @@ config ISDN_CAPI
57 hardware, see <http://www.capi.org/>. This is needed for AVM's set 57 hardware, see <http://www.capi.org/>. This is needed for AVM's set
58 of active ISDN controllers like B1, T1, M1. 58 of active ISDN controllers like B1, T1, M1.
59 59
60if ISDN_CAPI
61
60source "drivers/isdn/capi/Kconfig" 62source "drivers/isdn/capi/Kconfig"
61 63
62source "drivers/isdn/hardware/Kconfig" 64source "drivers/isdn/hardware/Kconfig"
63 65
66endif # ISDN_CAPI
67
64endif # ISDN 68endif # ISDN
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index c92f9d764fce..e1afd60924fb 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -3,7 +3,6 @@
3# 3#
4config ISDN_DRV_AVMB1_VERBOSE_REASON 4config ISDN_DRV_AVMB1_VERBOSE_REASON
5 bool "Verbose reason code reporting" 5 bool "Verbose reason code reporting"
6 depends on ISDN_CAPI
7 default y 6 default y
8 help 7 help
9 If you say Y here, the CAPI drivers will give verbose reasons for 8 If you say Y here, the CAPI drivers will give verbose reasons for
@@ -12,7 +11,6 @@ config ISDN_DRV_AVMB1_VERBOSE_REASON
12 11
13config CAPI_TRACE 12config CAPI_TRACE
14 bool "CAPI trace support" 13 bool "CAPI trace support"
15 depends on ISDN_CAPI
16 default y 14 default y
17 help 15 help
18 If you say Y here, the kernelcapi driver can make verbose traces 16 If you say Y here, the kernelcapi driver can make verbose traces
@@ -23,7 +21,7 @@ config CAPI_TRACE
23 21
24config ISDN_CAPI_MIDDLEWARE 22config ISDN_CAPI_MIDDLEWARE
25 bool "CAPI2.0 Middleware support (EXPERIMENTAL)" 23 bool "CAPI2.0 Middleware support (EXPERIMENTAL)"
26 depends on ISDN_CAPI && EXPERIMENTAL 24 depends on EXPERIMENTAL
27 help 25 help
28 This option will enhance the capabilities of the /dev/capi20 26 This option will enhance the capabilities of the /dev/capi20
29 interface. It will provide a means of moving a data connection, 27 interface. It will provide a means of moving a data connection,
@@ -33,7 +31,6 @@ config ISDN_CAPI_MIDDLEWARE
33 31
34config ISDN_CAPI_CAPI20 32config ISDN_CAPI_CAPI20
35 tristate "CAPI2.0 /dev/capi support" 33 tristate "CAPI2.0 /dev/capi support"
36 depends on ISDN_CAPI
37 help 34 help
38 This option will provide the CAPI 2.0 interface to userspace 35 This option will provide the CAPI 2.0 interface to userspace
39 applications via /dev/capi20. Applications should use the 36 applications via /dev/capi20. Applications should use the
@@ -56,7 +53,7 @@ config ISDN_CAPI_CAPIFS
56 53
57config ISDN_CAPI_CAPIDRV 54config ISDN_CAPI_CAPIDRV
58 tristate "CAPI2.0 capidrv interface support" 55 tristate "CAPI2.0 capidrv interface support"
59 depends on ISDN_CAPI && ISDN_I4L 56 depends on ISDN_I4L
60 help 57 help
61 This option provides the glue code to hook up CAPI driven cards to 58 This option provides the glue code to hook up CAPI driven cards to
62 the legacy isdn4linux link layer. If you have a card which is 59 the legacy isdn4linux link layer. If you have a card which is
diff --git a/drivers/isdn/hardware/Kconfig b/drivers/isdn/hardware/Kconfig
index dfe7fec80508..30d028d24955 100644
--- a/drivers/isdn/hardware/Kconfig
+++ b/drivers/isdn/hardware/Kconfig
@@ -2,7 +2,6 @@
2# ISDN hardware drivers 2# ISDN hardware drivers
3# 3#
4comment "CAPI hardware drivers" 4comment "CAPI hardware drivers"
5 depends on ISDN_CAPI
6 5
7source "drivers/isdn/hardware/avm/Kconfig" 6source "drivers/isdn/hardware/avm/Kconfig"
8 7
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 @@
3# 3#
4 4
5menu "Active AVM cards" 5menu "Active AVM cards"
6 depends on ISDN_CAPI!=n
7 6
8config CAPI_AVM 7config CAPI_AVM
9 bool "Support AVM cards" 8 bool "Support AVM cards"
@@ -12,13 +11,13 @@ config CAPI_AVM
12 11
13config ISDN_DRV_AVMB1_B1ISA 12config ISDN_DRV_AVMB1_B1ISA
14 tristate "AVM B1 ISA support" 13 tristate "AVM B1 ISA support"
15 depends on CAPI_AVM && ISDN_CAPI && ISA 14 depends on CAPI_AVM && ISA
16 help 15 help
17 Enable support for the ISA version of the AVM B1 card. 16 Enable support for the ISA version of the AVM B1 card.
18 17
19config ISDN_DRV_AVMB1_B1PCI 18config ISDN_DRV_AVMB1_B1PCI
20 tristate "AVM B1 PCI support" 19 tristate "AVM B1 PCI support"
21 depends on CAPI_AVM && ISDN_CAPI && PCI 20 depends on CAPI_AVM && PCI
22 help 21 help
23 Enable support for the PCI version of the AVM B1 card. 22 Enable support for the PCI version of the AVM B1 card.
24 23
@@ -30,14 +29,14 @@ config ISDN_DRV_AVMB1_B1PCIV4
30 29
31config ISDN_DRV_AVMB1_T1ISA 30config ISDN_DRV_AVMB1_T1ISA
32 tristate "AVM T1/T1-B ISA support" 31 tristate "AVM T1/T1-B ISA support"
33 depends on CAPI_AVM && ISDN_CAPI && ISA 32 depends on CAPI_AVM && ISA
34 help 33 help
35 Enable support for the AVM T1 T1B card. 34 Enable support for the AVM T1 T1B card.
36 Note: This is a PRI card and handle 30 B-channels. 35 Note: This is a PRI card and handle 30 B-channels.
37 36
38config ISDN_DRV_AVMB1_B1PCMCIA 37config ISDN_DRV_AVMB1_B1PCMCIA
39 tristate "AVM B1/M1/M2 PCMCIA support" 38 tristate "AVM B1/M1/M2 PCMCIA support"
40 depends on CAPI_AVM && ISDN_CAPI 39 depends on CAPI_AVM
41 help 40 help
42 Enable support for the PCMCIA version of the AVM B1 card. 41 Enable support for the PCMCIA version of the AVM B1 card.
43 42
@@ -50,14 +49,14 @@ config ISDN_DRV_AVMB1_AVM_CS
50 49
51config ISDN_DRV_AVMB1_T1PCI 50config ISDN_DRV_AVMB1_T1PCI
52 tristate "AVM T1/T1-B PCI support" 51 tristate "AVM T1/T1-B PCI support"
53 depends on CAPI_AVM && ISDN_CAPI && PCI 52 depends on CAPI_AVM && PCI
54 help 53 help
55 Enable support for the AVM T1 T1B card. 54 Enable support for the AVM T1 T1B card.
56 Note: This is a PRI card and handle 30 B-channels. 55 Note: This is a PRI card and handle 30 B-channels.
57 56
58config ISDN_DRV_AVMB1_C4 57config ISDN_DRV_AVMB1_C4
59 tristate "AVM C4/C2 support" 58 tristate "AVM C4/C2 support"
60 depends on CAPI_AVM && ISDN_CAPI && PCI 59 depends on CAPI_AVM && PCI
61 help 60 help
62 Enable support for the AVM C4/C2 PCI cards. 61 Enable support for the AVM C4/C2 PCI cards.
63 These cards handle 4/2 BRI ISDN lines (8/4 channels). 62 These cards handle 4/2 BRI ISDN lines (8/4 channels).
diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig
index fbfae881af6b..a319783f12d5 100644
--- a/drivers/isdn/hardware/eicon/Kconfig
+++ b/drivers/isdn/hardware/eicon/Kconfig
@@ -3,7 +3,6 @@
3# 3#
4 4
5menu "Active Eicon DIVA Server cards" 5menu "Active Eicon DIVA Server cards"
6 depends on ISDN_CAPI!=n
7 6
8config CAPI_EICON 7config CAPI_EICON
9 bool "Support Eicon cards" 8 bool "Support Eicon cards"
@@ -32,7 +31,7 @@ config ISDN_DIVAS_PRIPCI
32 31
33config ISDN_DIVAS_DIVACAPI 32config ISDN_DIVAS_DIVACAPI
34 tristate "DIVA CAPI2.0 interface support" 33 tristate "DIVA CAPI2.0 interface support"
35 depends on ISDN_DIVAS && ISDN_CAPI 34 depends on ISDN_DIVAS
36 help 35 help
37 You need this to provide the CAPI interface 36 You need this to provide the CAPI interface
38 for DIVA Server cards. 37 for DIVA Server cards.