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

drivers/isdn/act2000/Kconfig

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

drivers/isdn/gigaset/Kconfig

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

drivers/isdn/hisax/Kconfig

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




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"

drivers/isdn/i4l/Kconfig

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