lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use menuconfig objects: ISDN: CONFIG_ISDN

Browse Source 
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 <jengelh@gmx.de>
Cc: 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:
Jan Engelhardt
2007-07-17 04:04:19 -07:00
committed by Linus Torvalds
parent c713f57ed5
commit cf4d5f1d50
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/isdn/Kconfig
View File

@@ -2,12 +2,10 @@
# ISDN device configuration # ISDN device configuration
# #
menu "ISDN subsystem" menuconfig ISDN
depends on !S390
config ISDN
tristate "ISDN support" tristate "ISDN support"
depends on NET depends on NET
depends on !S390
---help--- ---help---
ISDN ("Integrated Services Digital Networks", called RNIS in France) ISDN ("Integrated Services Digital Networks", called RNIS in France)
is a special type of fully digital telephone service; it's mostly 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. Select this option if you want your kernel to support ISDN.
if ISDN
menu "Old ISDN4Linux" menu "Old ISDN4Linux"
depends on NET && ISDN
config ISDN_I4L config ISDN_I4L
tristate "Old ISDN4Linux (deprecated)" tristate "Old ISDN4Linux (deprecated)"
@@ -50,11 +48,9 @@ endif
endmenu endmenu
comment "CAPI subsystem" comment "CAPI subsystem"
depends on NET && ISDN
config ISDN_CAPI config ISDN_CAPI
tristate "CAPI2.0 support" tristate "CAPI2.0 support"
depends on ISDN
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
@@ -65,5 +61,4 @@ source "drivers/isdn/capi/Kconfig"
source "drivers/isdn/hardware/Kconfig" source "drivers/isdn/hardware/Kconfig"
endmenu endif # ISDN

2
drivers/isdn/hardware/Kconfig
View File

@@ -2,7 +2,7 @@
# ISDN hardware drivers # ISDN hardware drivers
# #
comment "CAPI hardware drivers" comment "CAPI hardware drivers"
depends on NET && ISDN && ISDN_CAPI depends on ISDN_CAPI
source "drivers/isdn/hardware/avm/Kconfig" source "drivers/isdn/hardware/avm/Kconfig"

2
drivers/isdn/hardware/avm/Kconfig
View File

@@ -3,7 +3,7 @@
# #
menu "Active AVM cards" menu "Active AVM cards"
depends on NET && ISDN && ISDN_CAPI!=n depends on ISDN_CAPI!=n
config CAPI_AVM config CAPI_AVM
bool "Support AVM cards" bool "Support AVM cards"

2
drivers/isdn/hardware/eicon/Kconfig
View File

@@ -3,7 +3,7 @@
# #
menu "Active Eicon DIVA Server cards" menu "Active Eicon DIVA Server cards"
depends on NET && ISDN && ISDN_CAPI!=n depends on ISDN_CAPI!=n
config CAPI_EICON config CAPI_EICON
bool "Support Eicon cards" bool "Support Eicon cards"

7
drivers/isdn/i4l/Kconfig
View File

@@ -86,7 +86,6 @@ config ISDN_X25
menu "ISDN feature submodules" menu "ISDN feature submodules"
depends on ISDN
config ISDN_DRV_LOOP config ISDN_DRV_LOOP
tristate "isdnloop support" tristate "isdnloop support"
@@ -100,7 +99,7 @@ config ISDN_DRV_LOOP
config ISDN_DIVERSION config ISDN_DIVERSION
tristate "Support isdn diversion services" tristate "Support isdn diversion services"
depends on ISDN && ISDN_I4L 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
@@ -120,13 +119,13 @@ config ISDN_DIVERSION
endmenu endmenu
comment "ISDN4Linux hardware drivers" comment "ISDN4Linux hardware drivers"
depends on NET && ISDN && ISDN_I4L depends on ISDN_I4L
source "drivers/isdn/hisax/Kconfig" source "drivers/isdn/hisax/Kconfig"
menu "Active cards" menu "Active cards"
depends on NET && ISDN && ISDN_I4L!=n depends on ISDN_I4L!=n
source "drivers/isdn/icn/Kconfig" source "drivers/isdn/icn/Kconfig"