Commit 5f67c5cc authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds

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: default avatarTilman Schmidt <tilman@imap.cc>
Cc: Jan Engelhardt <jengelh@computergmbh.de>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 149a6501
...@@ -21,8 +21,6 @@ menuconfig ISDN ...@@ -21,8 +21,6 @@ menuconfig ISDN
if ISDN if ISDN
menu "Old ISDN4Linux"
config ISDN_I4L config ISDN_I4L
tristate "Old ISDN4Linux (deprecated)" tristate "Old ISDN4Linux (deprecated)"
---help--- ---help---
...@@ -45,12 +43,8 @@ if ISDN_I4L ...@@ -45,12 +43,8 @@ if ISDN_I4L
source "drivers/isdn/i4l/Kconfig" source "drivers/isdn/i4l/Kconfig"
endif endif
endmenu
comment "CAPI subsystem"
config ISDN_CAPI config ISDN_CAPI
tristate "CAPI2.0 support" tristate "CAPI 2.0 subsystem"
help help
This provides the CAPI (Common ISDN Application Programming This provides the CAPI (Common ISDN Application Programming
Interface, a standard making it easy for programs to access ISDN Interface, a standard making it easy for programs to access ISDN
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config ISDN_DRV_ACT2000 config ISDN_DRV_ACT2000
tristate "IBM Active 2000 support" tristate "IBM Active 2000 support"
depends on ISDN_I4L && ISA depends on ISA
help help
Say Y here if you have an IBM Active 2000 ISDN card. In order to use 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 this card, additional firmware is necessary, which has to be loaded
......
menu "Siemens Gigaset" menu "Siemens Gigaset"
depends on ISDN_I4L
config ISDN_DRV_GIGASET config ISDN_DRV_GIGASET
tristate "Siemens Gigaset support (isdn)" tristate "Siemens Gigaset support (isdn)"
depends on ISDN_I4L
select CRC_CCITT select CRC_CCITT
select BITREVERSE select BITREVERSE
help help
......
menu "Passive cards" menu "Passive cards"
depends on ISDN_I4L
config ISDN_DRV_HISAX config ISDN_DRV_HISAX
tristate "HiSax SiemensChipSet driver support" tristate "HiSax SiemensChipSet driver support"
......
...@@ -99,7 +99,6 @@ config ISDN_DRV_LOOP ...@@ -99,7 +99,6 @@ config ISDN_DRV_LOOP
config ISDN_DIVERSION config ISDN_DIVERSION
tristate "Support isdn diversion services" tristate "Support isdn diversion services"
depends on ISDN_I4L
help help
This option allows you to use some supplementary diversion This option allows you to use some supplementary diversion
services in conjunction with the HiSax driver on an EURO/DSS1 services in conjunction with the HiSax driver on an EURO/DSS1
...@@ -119,13 +118,11 @@ config ISDN_DIVERSION ...@@ -119,13 +118,11 @@ config ISDN_DIVERSION
endmenu endmenu
comment "ISDN4Linux hardware drivers" comment "ISDN4Linux hardware drivers"
depends on ISDN_I4L
source "drivers/isdn/hisax/Kconfig" source "drivers/isdn/hisax/Kconfig"
menu "Active cards" menu "Active cards"
depends on ISDN_I4L!=n
source "drivers/isdn/icn/Kconfig" source "drivers/isdn/icn/Kconfig"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config ISDN_DRV_ICN config ISDN_DRV_ICN
tristate "ICN 2B and 4B support" tristate "ICN 2B and 4B support"
depends on ISDN_I4L && ISA depends on ISA
help help
This enables support for two kinds of ISDN-cards made by a German 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 company called ICN. 2B is the standard version for a single ISDN
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config ISDN_DRV_PCBIT config ISDN_DRV_PCBIT
tristate "PCBIT-D support" tristate "PCBIT-D support"
depends on ISDN_I4L && ISA && (BROKEN || X86) depends on ISA && (BROKEN || X86)
help help
This enables support for the PCBIT ISDN-card. This card is This enables support for the PCBIT ISDN-card. This card is
manufactured in Portugal by Octal. For running this card, manufactured in Portugal by Octal. For running this card,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config ISDN_DRV_SC config ISDN_DRV_SC
tristate "Spellcaster support" tristate "Spellcaster support"
depends on ISDN_I4L && ISA depends on ISA
help help
This enables support for the Spellcaster BRI ISDN boards. This This enables support for the Spellcaster BRI ISDN boards. This
driver currently builds only in a modularized version. driver currently builds only in a modularized version.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment