Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/isdn/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -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

drivers/isdn/act2000/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/isdn/gigaset/Kconfig

+0 −2
Original line number Diff line number Diff line 
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

drivers/isdn/hisax/Kconfig

+0 −1
Original line number Diff line number Diff line 


menu "Passive cards"

	depends on ISDN_I4L



config ISDN_DRV_HISAX

	tristate "HiSax SiemensChipSet driver support"

drivers/isdn/i4l/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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"