From cf4d5f1d50e44d36d459344da3c8f226b3933aeb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 17 Jul 2007 04:04:19 -0700 Subject: [PATCH] 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: Jan Engelhardt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/isdn/Kconfig | 13 ++++--------- drivers/isdn/hardware/Kconfig | 2 +- drivers/isdn/hardware/avm/Kconfig | 2 +- drivers/isdn/hardware/eicon/Kconfig | 2 +- drivers/isdn/i4l/Kconfig | 7 +++---- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index 3e088c42b2..a3c9a03431 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -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 diff --git a/drivers/isdn/hardware/Kconfig b/drivers/isdn/hardware/Kconfig index 139f197977..dfe7fec805 100644 --- a/drivers/isdn/hardware/Kconfig +++ b/drivers/isdn/hardware/Kconfig @@ -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" diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig index 29a32a8830..8ffdb4f73e 100644 --- a/drivers/isdn/hardware/avm/Kconfig +++ b/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" diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig index 01d4afd9d8..fbfae881af 100644 --- a/drivers/isdn/hardware/eicon/Kconfig +++ b/drivers/isdn/hardware/eicon/Kconfig @@ -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" diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index 3ef567b99c..e91c187992 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -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" -- 2.39.5