aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2007-07-21 07:37:53 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 20:49:17 -0400
commit5f67c5cc855d5a189fc542da3921868ca87fc274 (patch)
treec103f84beff6a9c779b3047e3c9fe440c609a731
parent149a6501f90df457d75a1954dd5a29434a182e6a (diff)
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: Tilman Schmidt <tilman@imap.cc> Cc: Jan Engelhardt <jengelh@computergmbh.de> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/isdn/Kconfig8
-rw-r--r--drivers/isdn/act2000/Kconfig2
-rw-r--r--drivers/isdn/gigaset/Kconfig2
-rw-r--r--drivers/isdn/hisax/Kconfig1
-rw-r--r--drivers/isdn/i4l/Kconfig3
-rw-r--r--drivers/isdn/icn/Kconfig2
-rw-r--r--drivers/isdn/pcbit/Kconfig2
-rw-r--r--drivers/isdn/sc/Kconfig2
8 files changed, 5 insertions, 17 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index cf906c8cee4d..813ed4cc6d3b 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -21,8 +21,6 @@ menuconfig ISDN
21 21
22if ISDN 22if ISDN
23 23
24menu "Old ISDN4Linux"
25
26config ISDN_I4L 24config ISDN_I4L
27 tristate "Old ISDN4Linux (deprecated)" 25 tristate "Old ISDN4Linux (deprecated)"
28 ---help--- 26 ---help---
@@ -45,12 +43,8 @@ if ISDN_I4L
45source "drivers/isdn/i4l/Kconfig" 43source "drivers/isdn/i4l/Kconfig"
46endif 44endif
47 45
48endmenu
49
50comment "CAPI subsystem"
51
52config ISDN_CAPI 46config ISDN_CAPI
53 tristate "CAPI2.0 support" 47 tristate "CAPI 2.0 subsystem"
54 help 48 help
55 This provides the CAPI (Common ISDN Application Programming 49 This provides the CAPI (Common ISDN Application Programming
56 Interface, a standard making it easy for programs to access ISDN 50 Interface, a standard making it easy for programs to access ISDN
diff --git a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig
index 78e6ad8d57c5..3fc1a5434ef7 100644
--- a/drivers/isdn/act2000/Kconfig
+++ b/drivers/isdn/act2000/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4config ISDN_DRV_ACT2000 4config ISDN_DRV_ACT2000
5 tristate "IBM Active 2000 support" 5 tristate "IBM Active 2000 support"
6 depends on ISDN_I4L && ISA 6 depends on ISA
7 help 7 help
8 Say Y here if you have an IBM Active 2000 ISDN card. In order to use 8 Say Y here if you have an IBM Active 2000 ISDN card. In order to use
9 this card, additional firmware is necessary, which has to be loaded 9 this card, additional firmware is necessary, which has to be loaded
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index bcbb6502a773..018b7934b973 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,9 +1,7 @@
1menu "Siemens Gigaset" 1menu "Siemens Gigaset"
2 depends on ISDN_I4L
3 2
4config ISDN_DRV_GIGASET 3config ISDN_DRV_GIGASET
5 tristate "Siemens Gigaset support (isdn)" 4 tristate "Siemens Gigaset support (isdn)"
6 depends on ISDN_I4L
7 select CRC_CCITT 5 select CRC_CCITT
8 select BITREVERSE 6 select BITREVERSE
9 help 7 help
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 12d91fb9f8cb..a3b945ac3256 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -1,6 +1,5 @@
1 1
2menu "Passive cards" 2menu "Passive cards"
3 depends on ISDN_I4L
4 3
5config ISDN_DRV_HISAX 4config ISDN_DRV_HISAX
6 tristate "HiSax SiemensChipSet driver support" 5 tristate "HiSax SiemensChipSet driver support"
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index e91c187992dd..36778b270c30 100644
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -99,7 +99,6 @@ config ISDN_DRV_LOOP
99 99
100config ISDN_DIVERSION 100config ISDN_DIVERSION
101 tristate "Support isdn diversion services" 101 tristate "Support isdn diversion services"
102 depends on ISDN_I4L
103 help 102 help
104 This option allows you to use some supplementary diversion 103 This option allows you to use some supplementary diversion
105 services in conjunction with the HiSax driver on an EURO/DSS1 104 services in conjunction with the HiSax driver on an EURO/DSS1
@@ -119,13 +118,11 @@ config ISDN_DIVERSION
119endmenu 118endmenu
120 119
121comment "ISDN4Linux hardware drivers" 120comment "ISDN4Linux hardware drivers"
122 depends on ISDN_I4L
123 121
124source "drivers/isdn/hisax/Kconfig" 122source "drivers/isdn/hisax/Kconfig"
125 123
126 124
127menu "Active cards" 125menu "Active cards"
128 depends on ISDN_I4L!=n
129 126
130source "drivers/isdn/icn/Kconfig" 127source "drivers/isdn/icn/Kconfig"
131 128
diff --git a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig
index fcb99f5f0b26..89d15eed765e 100644
--- a/drivers/isdn/icn/Kconfig
+++ b/drivers/isdn/icn/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4config ISDN_DRV_ICN 4config ISDN_DRV_ICN
5 tristate "ICN 2B and 4B support" 5 tristate "ICN 2B and 4B support"
6 depends on ISDN_I4L && ISA 6 depends on ISA
7 help 7 help
8 This enables support for two kinds of ISDN-cards made by a German 8 This enables support for two kinds of ISDN-cards made by a German
9 company called ICN. 2B is the standard version for a single ISDN 9 company called ICN. 2B is the standard version for a single ISDN
diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig
index 0933881ab0c2..ffba6eca1244 100644
--- a/drivers/isdn/pcbit/Kconfig
+++ b/drivers/isdn/pcbit/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4config ISDN_DRV_PCBIT 4config ISDN_DRV_PCBIT
5 tristate "PCBIT-D support" 5 tristate "PCBIT-D support"
6 depends on ISDN_I4L && ISA && (BROKEN || X86) 6 depends on ISA && (BROKEN || X86)
7 help 7 help
8 This enables support for the PCBIT ISDN-card. This card is 8 This enables support for the PCBIT ISDN-card. This card is
9 manufactured in Portugal by Octal. For running this card, 9 manufactured in Portugal by Octal. For running this card,
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig
index 5346e33d816c..e6510ca7bf43 100644
--- a/drivers/isdn/sc/Kconfig
+++ b/drivers/isdn/sc/Kconfig
@@ -3,7 +3,7 @@
3# 3#
4config ISDN_DRV_SC 4config ISDN_DRV_SC
5 tristate "Spellcaster support" 5 tristate "Spellcaster support"
6 depends on ISDN_I4L && ISA 6 depends on ISA
7 help 7 help
8 This enables support for the Spellcaster BRI ISDN boards. This 8 This enables support for the Spellcaster BRI ISDN boards. This
9 driver currently builds only in a modularized version. 9 driver currently builds only in a modularized version.