From 5f67c5cc855d5a189fc542da3921868ca87fc274 Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Sat, 21 Jul 2007 04:37:53 -0700 Subject: Use menuconfig objects - CONFIG_ISDN_I4L Remove a menu statement and several dependencies from the Kconfig files in the drivers/isdn tree as they have become unnecessary by the transformation of CONFIG_ISDN from "menu, config" into "menuconfig". (Modified version of a patch originally proposed by Jan Engelhardt.) Signed-off-by: Tilman Schmidt Cc: Jan Engelhardt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/isdn/Kconfig | 8 +------- drivers/isdn/act2000/Kconfig | 2 +- drivers/isdn/gigaset/Kconfig | 2 -- drivers/isdn/hisax/Kconfig | 1 - drivers/isdn/i4l/Kconfig | 3 --- drivers/isdn/icn/Kconfig | 2 +- drivers/isdn/pcbit/Kconfig | 2 +- drivers/isdn/sc/Kconfig | 2 +- 8 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index cf906c8cee4d..813ed4cc6d3b 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -21,8 +21,6 @@ menuconfig ISDN if ISDN -menu "Old ISDN4Linux" - config ISDN_I4L tristate "Old ISDN4Linux (deprecated)" ---help--- @@ -45,12 +43,8 @@ if ISDN_I4L source "drivers/isdn/i4l/Kconfig" endif -endmenu - -comment "CAPI subsystem" - config ISDN_CAPI - tristate "CAPI2.0 support" + tristate "CAPI 2.0 subsystem" help This provides the CAPI (Common ISDN Application Programming Interface, a standard making it easy for programs to access ISDN diff --git a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig index 78e6ad8d57c5..3fc1a5434ef7 100644 --- a/drivers/isdn/act2000/Kconfig +++ b/drivers/isdn/act2000/Kconfig @@ -3,7 +3,7 @@ # config ISDN_DRV_ACT2000 tristate "IBM Active 2000 support" - depends on ISDN_I4L && ISA + depends on ISA help Say Y here if you have an IBM Active 2000 ISDN card. In order to use this card, additional firmware is necessary, which has to be loaded diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig index bcbb6502a773..018b7934b973 100644 --- a/drivers/isdn/gigaset/Kconfig +++ b/drivers/isdn/gigaset/Kconfig @@ -1,9 +1,7 @@ menu "Siemens Gigaset" - depends on ISDN_I4L config ISDN_DRV_GIGASET tristate "Siemens Gigaset support (isdn)" - depends on ISDN_I4L select CRC_CCITT select BITREVERSE help diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 12d91fb9f8cb..a3b945ac3256 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -1,6 +1,5 @@ menu "Passive cards" - depends on ISDN_I4L config ISDN_DRV_HISAX tristate "HiSax SiemensChipSet driver support" diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index e91c187992dd..36778b270c30 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -99,7 +99,6 @@ config ISDN_DRV_LOOP config ISDN_DIVERSION tristate "Support isdn diversion services" - depends on ISDN_I4L help This option allows you to use some supplementary diversion services in conjunction with the HiSax driver on an EURO/DSS1 @@ -119,13 +118,11 @@ config ISDN_DIVERSION endmenu comment "ISDN4Linux hardware drivers" - depends on ISDN_I4L source "drivers/isdn/hisax/Kconfig" menu "Active cards" - depends on ISDN_I4L!=n source "drivers/isdn/icn/Kconfig" diff --git a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig index fcb99f5f0b26..89d15eed765e 100644 --- a/drivers/isdn/icn/Kconfig +++ b/drivers/isdn/icn/Kconfig @@ -3,7 +3,7 @@ # config ISDN_DRV_ICN tristate "ICN 2B and 4B support" - depends on ISDN_I4L && ISA + depends on ISA help This enables support for two kinds of ISDN-cards made by a German company called ICN. 2B is the standard version for a single ISDN diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig index 0933881ab0c2..ffba6eca1244 100644 --- a/drivers/isdn/pcbit/Kconfig +++ b/drivers/isdn/pcbit/Kconfig @@ -3,7 +3,7 @@ # config ISDN_DRV_PCBIT tristate "PCBIT-D support" - depends on ISDN_I4L && ISA && (BROKEN || X86) + depends on ISA && (BROKEN || X86) help This enables support for the PCBIT ISDN-card. This card is manufactured in Portugal by Octal. For running this card, diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig index 5346e33d816c..e6510ca7bf43 100644 --- a/drivers/isdn/sc/Kconfig +++ b/drivers/isdn/sc/Kconfig @@ -3,7 +3,7 @@ # config ISDN_DRV_SC tristate "Spellcaster support" - depends on ISDN_I4L && ISA + depends on ISA help This enables support for the Spellcaster BRI ISDN boards. This driver currently builds only in a modularized version. -- cgit v1.2.3