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>
This commit is contained in:
Jan Engelhardt 2007-07-17 04:04:20 -07:00 committed by Linus Torvalds
parent cf4d5f1d50
commit df19434cc2
5 changed files with 13 additions and 15 deletions

View file

@ -57,8 +57,12 @@ config ISDN_CAPI
hardware, see <http://www.capi.org/>. This is needed for AVM's set hardware, see <http://www.capi.org/>. This is needed for AVM's set
of active ISDN controllers like B1, T1, M1. of active ISDN controllers like B1, T1, M1.
if ISDN_CAPI
source "drivers/isdn/capi/Kconfig" source "drivers/isdn/capi/Kconfig"
source "drivers/isdn/hardware/Kconfig" source "drivers/isdn/hardware/Kconfig"
endif # ISDN_CAPI
endif # ISDN endif # ISDN

View file

@ -3,7 +3,6 @@
# #
config ISDN_DRV_AVMB1_VERBOSE_REASON config ISDN_DRV_AVMB1_VERBOSE_REASON
bool "Verbose reason code reporting" bool "Verbose reason code reporting"
depends on ISDN_CAPI
default y default y
help help
If you say Y here, the CAPI drivers will give verbose reasons for If you say Y here, the CAPI drivers will give verbose reasons for
@ -12,7 +11,6 @@ config ISDN_DRV_AVMB1_VERBOSE_REASON
config CAPI_TRACE config CAPI_TRACE
bool "CAPI trace support" bool "CAPI trace support"
depends on ISDN_CAPI
default y default y
help help
If you say Y here, the kernelcapi driver can make verbose traces If you say Y here, the kernelcapi driver can make verbose traces
@ -23,7 +21,7 @@ config CAPI_TRACE
config ISDN_CAPI_MIDDLEWARE config ISDN_CAPI_MIDDLEWARE
bool "CAPI2.0 Middleware support (EXPERIMENTAL)" bool "CAPI2.0 Middleware support (EXPERIMENTAL)"
depends on ISDN_CAPI && EXPERIMENTAL depends on EXPERIMENTAL
help help
This option will enhance the capabilities of the /dev/capi20 This option will enhance the capabilities of the /dev/capi20
interface. It will provide a means of moving a data connection, interface. It will provide a means of moving a data connection,
@ -33,7 +31,6 @@ config ISDN_CAPI_MIDDLEWARE
config ISDN_CAPI_CAPI20 config ISDN_CAPI_CAPI20
tristate "CAPI2.0 /dev/capi support" tristate "CAPI2.0 /dev/capi support"
depends on ISDN_CAPI
help help
This option will provide the CAPI 2.0 interface to userspace This option will provide the CAPI 2.0 interface to userspace
applications via /dev/capi20. Applications should use the applications via /dev/capi20. Applications should use the
@ -56,7 +53,7 @@ config ISDN_CAPI_CAPIFS
config ISDN_CAPI_CAPIDRV config ISDN_CAPI_CAPIDRV
tristate "CAPI2.0 capidrv interface support" tristate "CAPI2.0 capidrv interface support"
depends on ISDN_CAPI && ISDN_I4L depends on ISDN_I4L
help help
This option provides the glue code to hook up CAPI driven cards to This option provides the glue code to hook up CAPI driven cards to
the legacy isdn4linux link layer. If you have a card which is the legacy isdn4linux link layer. If you have a card which is

View file

@ -2,7 +2,6 @@
# ISDN hardware drivers # ISDN hardware drivers
# #
comment "CAPI hardware drivers" comment "CAPI hardware drivers"
depends on ISDN_CAPI
source "drivers/isdn/hardware/avm/Kconfig" source "drivers/isdn/hardware/avm/Kconfig"

View file

@ -3,7 +3,6 @@
# #
menu "Active AVM cards" menu "Active AVM cards"
depends on ISDN_CAPI!=n
config CAPI_AVM config CAPI_AVM
bool "Support AVM cards" bool "Support AVM cards"
@ -12,13 +11,13 @@ config CAPI_AVM
config ISDN_DRV_AVMB1_B1ISA config ISDN_DRV_AVMB1_B1ISA
tristate "AVM B1 ISA support" tristate "AVM B1 ISA support"
depends on CAPI_AVM && ISDN_CAPI && ISA depends on CAPI_AVM && ISA
help help
Enable support for the ISA version of the AVM B1 card. Enable support for the ISA version of the AVM B1 card.
config ISDN_DRV_AVMB1_B1PCI config ISDN_DRV_AVMB1_B1PCI
tristate "AVM B1 PCI support" tristate "AVM B1 PCI support"
depends on CAPI_AVM && ISDN_CAPI && PCI depends on CAPI_AVM && PCI
help help
Enable support for the PCI version of the AVM B1 card. 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 config ISDN_DRV_AVMB1_T1ISA
tristate "AVM T1/T1-B ISA support" tristate "AVM T1/T1-B ISA support"
depends on CAPI_AVM && ISDN_CAPI && ISA depends on CAPI_AVM && ISA
help help
Enable support for the AVM T1 T1B card. Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels. Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_B1PCMCIA config ISDN_DRV_AVMB1_B1PCMCIA
tristate "AVM B1/M1/M2 PCMCIA support" tristate "AVM B1/M1/M2 PCMCIA support"
depends on CAPI_AVM && ISDN_CAPI depends on CAPI_AVM
help help
Enable support for the PCMCIA version of the AVM B1 card. 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 config ISDN_DRV_AVMB1_T1PCI
tristate "AVM T1/T1-B PCI support" tristate "AVM T1/T1-B PCI support"
depends on CAPI_AVM && ISDN_CAPI && PCI depends on CAPI_AVM && PCI
help help
Enable support for the AVM T1 T1B card. Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels. Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_C4 config ISDN_DRV_AVMB1_C4
tristate "AVM C4/C2 support" tristate "AVM C4/C2 support"
depends on CAPI_AVM && ISDN_CAPI && PCI depends on CAPI_AVM && PCI
help help
Enable support for the AVM C4/C2 PCI cards. Enable support for the AVM C4/C2 PCI cards.
These cards handle 4/2 BRI ISDN lines (8/4 channels). These cards handle 4/2 BRI ISDN lines (8/4 channels).

View file

@ -3,7 +3,6 @@
# #
menu "Active Eicon DIVA Server cards" menu "Active Eicon DIVA Server cards"
depends on ISDN_CAPI!=n
config CAPI_EICON config CAPI_EICON
bool "Support Eicon cards" bool "Support Eicon cards"
@ -32,7 +31,7 @@ config ISDN_DIVAS_PRIPCI
config ISDN_DIVAS_DIVACAPI config ISDN_DIVAS_DIVACAPI
tristate "DIVA CAPI2.0 interface support" tristate "DIVA CAPI2.0 interface support"
depends on ISDN_DIVAS && ISDN_CAPI depends on ISDN_DIVAS
help help
You need this to provide the CAPI interface You need this to provide the CAPI interface
for DIVA Server cards. for DIVA Server cards.