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 <tilman@imap.cc>
Cc: Jan Engelhardt <jengelh@computergmbh.de>
Acked-by: 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:
Tilman Schmidt 2007-07-21 04:37:53 -07:00 committed by Linus Torvalds
parent 149a6501f9
commit 5f67c5cc85
8 changed files with 5 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,6 +1,5 @@
menu "Passive cards"
depends on ISDN_I4L
config ISDN_DRV_HISAX
tristate "HiSax SiemensChipSet driver support"

View File

@ -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"

View File

@ -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

View File

@ -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,

View File

@ -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.