Commit cf4d5f1d authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Linus Torvalds

Use menuconfig objects: ISDN: CONFIG_ISDN

Transform Kconfig objects from "menu, config" into "menuconfig" so that the
user can disable the whole feature without having to enter the menu first.
Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Cc: Karsten 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 c713f57e
......@@ -2,12 +2,10 @@
# ISDN device configuration
#
menu "ISDN subsystem"
depends on !S390
config ISDN
menuconfig ISDN
tristate "ISDN support"
depends on NET
depends on !S390
---help---
ISDN ("Integrated Services Digital Networks", called RNIS in France)
is a special type of fully digital telephone service; it's mostly
......@@ -21,9 +19,9 @@ config ISDN
Select this option if you want your kernel to support ISDN.
if ISDN
menu "Old ISDN4Linux"
depends on NET && ISDN
config ISDN_I4L
tristate "Old ISDN4Linux (deprecated)"
......@@ -50,11 +48,9 @@ endif
endmenu
comment "CAPI subsystem"
depends on NET && ISDN
config ISDN_CAPI
tristate "CAPI2.0 support"
depends on ISDN
help
This provides the CAPI (Common ISDN Application Programming
Interface, a standard making it easy for programs to access ISDN
......@@ -65,5 +61,4 @@ source "drivers/isdn/capi/Kconfig"
source "drivers/isdn/hardware/Kconfig"
endmenu
endif # ISDN
......@@ -2,7 +2,7 @@
# ISDN hardware drivers
#
comment "CAPI hardware drivers"
depends on NET && ISDN && ISDN_CAPI
depends on ISDN_CAPI
source "drivers/isdn/hardware/avm/Kconfig"
......
......@@ -3,7 +3,7 @@
#
menu "Active AVM cards"
depends on NET && ISDN && ISDN_CAPI!=n
depends on ISDN_CAPI!=n
config CAPI_AVM
bool "Support AVM cards"
......
......@@ -3,7 +3,7 @@
#
menu "Active Eicon DIVA Server cards"
depends on NET && ISDN && ISDN_CAPI!=n
depends on ISDN_CAPI!=n
config CAPI_EICON
bool "Support Eicon cards"
......
......@@ -86,7 +86,6 @@ config ISDN_X25
menu "ISDN feature submodules"
depends on ISDN
config ISDN_DRV_LOOP
tristate "isdnloop support"
......@@ -100,7 +99,7 @@ config ISDN_DRV_LOOP
config ISDN_DIVERSION
tristate "Support isdn diversion services"
depends on ISDN && ISDN_I4L
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
......@@ -120,13 +119,13 @@ config ISDN_DIVERSION
endmenu
comment "ISDN4Linux hardware drivers"
depends on NET && ISDN && ISDN_I4L
depends on ISDN_I4L
source "drivers/isdn/hisax/Kconfig"
menu "Active cards"
depends on NET && ISDN && ISDN_I4L!=n
depends on ISDN_I4L!=n
source "drivers/isdn/icn/Kconfig"
......
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