* [PATCH 01/06] Use menuconfig objects 4 - ISDN part 1/6 (CONFIG_ISDN)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
@ 2007-05-30 19:37 ` Jan Engelhardt
2007-05-30 19:38 ` [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L) Jan Engelhardt
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:37 UTC (permalink / raw)
To: Andrew Morton; +Cc: kkeil, Linux Kernel Mailing List
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>
---
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(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
+++ linux-2.6.22-rc3-git1/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 (obsolete)"
@@ -49,11 +47,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
@@ -64,5 +60,4 @@ source "drivers/isdn/capi/Kconfig"
source "drivers/isdn/hardware/Kconfig"
-endmenu
-
+endif # ISDN
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/Kconfig
+++ linux-2.6.22-rc3-git1/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"
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/avm/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/avm/Kconfig
+++ linux-2.6.22-rc3-git1/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"
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/eicon/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/eicon/Kconfig
+++ linux-2.6.22-rc3-git1/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"
Index: linux-2.6.22-rc3-git1/drivers/isdn/i4l/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/i4l/Kconfig
+++ linux-2.6.22-rc3-git1/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"
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
2007-05-30 19:37 ` [PATCH 01/06] Use menuconfig objects 4 - ISDN part 1/6 (CONFIG_ISDN) Jan Engelhardt
@ 2007-05-30 19:38 ` Jan Engelhardt
2007-05-31 16:16 ` Tilman Schmidt
2007-05-30 19:39 ` [PATCH 03/06] Use menuconfig objects 4 - ISDN part 3/6 (CONFIG_ISDN_DRV_GIGASET) Jan Engelhardt
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:38 UTC (permalink / raw)
To: Andrew Morton; +Cc: kkeil, Linux Kernel Mailing List
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>
---
drivers/isdn/Kconfig | 6 +-----
drivers/isdn/act2000/Kconfig | 2 +-
drivers/isdn/gigaset/Kconfig | 2 --
drivers/isdn/hisax/Kconfig | 1 -
drivers/isdn/i4l/Kconfig | 3 ---
drivers/isdn/icn/Kconfig | 2 +-
drivers/isdn/pcbit/Kconfig | 2 +-
drivers/isdn/sc/Kconfig | 2 +-
8 files changed, 5 insertions(+), 15 deletions(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
@@ -21,9 +21,7 @@ menuconfig ISDN
if ISDN
-menu "Old ISDN4Linux"
-
-config ISDN_I4L
+menuconfig ISDN_I4L
tristate "Old ISDN4Linux (obsolete)"
---help---
This driver allows you to use an ISDN-card for networking
@@ -44,8 +42,6 @@ if ISDN_I4L
source "drivers/isdn/i4l/Kconfig"
endif
-endmenu
-
comment "CAPI subsystem"
config ISDN_CAPI
Index: linux-2.6.22-rc3-git1/drivers/isdn/act2000/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/act2000/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/act2000/Kconfig
@@ -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
Index: linux-2.6.22-rc3-git1/drivers/isdn/gigaset/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/gigaset/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/gigaset/Kconfig
@@ -1,9 +1,7 @@
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
Index: linux-2.6.22-rc3-git1/drivers/isdn/hisax/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hisax/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hisax/Kconfig
@@ -1,6 +1,5 @@
menu "Passive cards"
- depends on ISDN_I4L
config ISDN_DRV_HISAX
tristate "HiSax SiemensChipSet driver support"
Index: linux-2.6.22-rc3-git1/drivers/isdn/i4l/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/i4l/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/i4l/Kconfig
@@ -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"
Index: linux-2.6.22-rc3-git1/drivers/isdn/icn/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/icn/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/icn/Kconfig
@@ -3,7 +3,7 @@
#
config ISDN_DRV_ICN
tristate "ICN 2B and 4B support"
- depends on ISDN_I4L && ISA
+ depends on ISA
help
This enables support for two kinds of ISDN-cards made by a German
company called ICN. 2B is the standard version for a single ISDN
Index: linux-2.6.22-rc3-git1/drivers/isdn/pcbit/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/pcbit/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/pcbit/Kconfig
@@ -3,7 +3,7 @@
#
config ISDN_DRV_PCBIT
tristate "PCBIT-D support"
- depends on ISDN_I4L && ISA && (BROKEN || X86)
+ depends on ISA && (BROKEN || X86)
help
This enables support for the PCBIT ISDN-card. This card is
manufactured in Portugal by Octal. For running this card,
Index: linux-2.6.22-rc3-git1/drivers/isdn/sc/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/sc/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/sc/Kconfig
@@ -3,7 +3,7 @@
#
config ISDN_DRV_SC
tristate "Spellcaster support"
- depends on ISDN_I4L && ISA
+ depends on ISA
help
This enables support for the Spellcaster BRI ISDN boards. This
driver currently builds only in a modularized version.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L)
2007-05-30 19:38 ` [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L) Jan Engelhardt
@ 2007-05-31 16:16 ` Tilman Schmidt
2007-05-31 16:20 ` Karsten Keil
2007-05-31 19:53 ` Jan Engelhardt
0 siblings, 2 replies; 10+ messages in thread
From: Tilman Schmidt @ 2007-05-31 16:16 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Andrew Morton, kkeil, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
Am 30.05.2007 21:38 schrieb Jan Engelhardt:
> --- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
> +++ linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
> @@ -21,9 +21,7 @@ menuconfig ISDN
>
> if ISDN
>
> -menu "Old ISDN4Linux"
> -
> -config ISDN_I4L
> +menuconfig ISDN_I4L
> tristate "Old ISDN4Linux (obsolete)"
> ---help---
> This driver allows you to use an ISDN-card for networking
> @@ -44,8 +42,6 @@ if ISDN_I4L
> source "drivers/isdn/i4l/Kconfig"
> endif
>
> -endmenu
> -
> comment "CAPI subsystem"
>
This results in a rather strange and inconsistent presentation in
"make xconfig", with ISDN4Linux appearing as a subtree in the left
pane but CAPI only visible in the right pane after selecting ISDN.
IMHO it looks much saner like this:
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -21,8 +21,6 @@ menuconfig ISDN
if ISDN
-menu "Old ISDN4Linux"
-
config ISDN_I4L
tristate "Old ISDN4Linux (deprecated)"
---help---
@@ -44,12 +42,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
This gives you a single entry in the left pane tree for disabling
all of ISDN with a single click, and nicely presents all of its
suboptions in the right pane once you select the tree entry.
HTH
Tilman
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 253 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L)
2007-05-31 16:16 ` Tilman Schmidt
@ 2007-05-31 16:20 ` Karsten Keil
2007-05-31 19:53 ` Jan Engelhardt
1 sibling, 0 replies; 10+ messages in thread
From: Karsten Keil @ 2007-05-31 16:20 UTC (permalink / raw)
To: Tilman Schmidt; +Cc: Jan Engelhardt, Andrew Morton, Linux Kernel Mailing List
On Thu, May 31, 2007 at 06:16:52PM +0200, Tilman Schmidt wrote:
> Am 30.05.2007 21:38 schrieb Jan Engelhardt:
> > --- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
> > +++ linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
> > @@ -21,9 +21,7 @@ menuconfig ISDN
> >
> > if ISDN
> >
> > -menu "Old ISDN4Linux"
> > -
> > -config ISDN_I4L
> > +menuconfig ISDN_I4L
> > tristate "Old ISDN4Linux (obsolete)"
> > ---help---
> > This driver allows you to use an ISDN-card for networking
> > @@ -44,8 +42,6 @@ if ISDN_I4L
> > source "drivers/isdn/i4l/Kconfig"
> > endif
> >
> > -endmenu
> > -
> > comment "CAPI subsystem"
> >
>
> This results in a rather strange and inconsistent presentation in
> "make xconfig", with ISDN4Linux appearing as a subtree in the left
> pane but CAPI only visible in the right pane after selecting ISDN.
> IMHO it looks much saner like this:
>
> --- a/drivers/isdn/Kconfig
> +++ b/drivers/isdn/Kconfig
> @@ -21,8 +21,6 @@ menuconfig ISDN
>
> if ISDN
>
> -menu "Old ISDN4Linux"
> -
> config ISDN_I4L
> tristate "Old ISDN4Linux (deprecated)"
> ---help---
> @@ -44,12 +42,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
>
> This gives you a single entry in the left pane tree for disabling
> all of ISDN with a single click, and nicely presents all of its
> suboptions in the right pane once you select the tree entry.
>
I agree.
--
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L)
2007-05-31 16:16 ` Tilman Schmidt
2007-05-31 16:20 ` Karsten Keil
@ 2007-05-31 19:53 ` Jan Engelhardt
2007-05-31 22:06 ` Tilman Schmidt
1 sibling, 1 reply; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-31 19:53 UTC (permalink / raw)
To: Tilman Schmidt; +Cc: Andrew Morton, kkeil, Linux Kernel Mailing List
On May 31 2007 18:16, Tilman Schmidt wrote:
>Am 30.05.2007 21:38 schrieb Jan Engelhardt:
>> --- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
>> +++ linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
>> @@ -21,9 +21,7 @@ menuconfig ISDN
>>
>> if ISDN
>>
>> -menu "Old ISDN4Linux"
>> -
>> -config ISDN_I4L
>> +menuconfig ISDN_I4L
>> tristate "Old ISDN4Linux (obsolete)"
>> ---help---
>> This driver allows you to use an ISDN-card for networking
>> @@ -44,8 +42,6 @@ if ISDN_I4L
>> source "drivers/isdn/i4l/Kconfig"
>> endif
>>
>> -endmenu
>> -
>> comment "CAPI subsystem"
>>
>
>This results in a rather strange and inconsistent presentation in
>"make xconfig", with ISDN4Linux appearing as a subtree in the left
>pane but CAPI only visible in the right pane after selecting ISDN.
That's a gconfig/xconfig b^H missing feature.
>IMHO it looks much saner like this:
But then you'd still have to descend into ISDN4Linux to deactivate it.
> config ISDN_I4L
> tristate "Old ISDN4Linux (deprecated)"
> ---help---
>@@ -44,12 +42,8 @@ if ISDN_I4L
Jan
--
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L)
2007-05-31 19:53 ` Jan Engelhardt
@ 2007-05-31 22:06 ` Tilman Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: Tilman Schmidt @ 2007-05-31 22:06 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Andrew Morton, kkeil, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]
Am 31.05.2007 21:53 schrieb Jan Engelhardt:
> On May 31 2007 18:16, Tilman Schmidt wrote:
[...]
>> This results in a rather strange and inconsistent presentation in
>> "make xconfig", with ISDN4Linux appearing as a subtree in the left
>> pane but CAPI only visible in the right pane after selecting ISDN.
>
> That's a gconfig/xconfig b^H missing feature.
Send patch. :-)
Anyway, treating ISDN4Linux and CAPI that differently is certainly
not appropriate, regardless of any xconfig bug, feature or other.
>> IMHO it looks much saner like this:
>
> But then you'd still have to descend into ISDN4Linux to deactivate it.
I don't know what you mean. The only menus I have to enter first
in order to deactivate them are the ones you left alone:
"Passive cards" (ISDN_DRV_HISAX), "Active cards" (no top-level
option), "Active AVM cards" (CAPI_AVM) and "Active Eicon DIVA
Server cards" (CAPI_EICON). There's no problem deactivating
ISDN_I4L or ISDN_CAPI (or both, should the fancy take me)
directly in the ISDN menu, neither in "make xconfig" nor in
"make menuconfig".
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 253 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 03/06] Use menuconfig objects 4 - ISDN part 3/6 (CONFIG_ISDN_DRV_GIGASET)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
2007-05-30 19:37 ` [PATCH 01/06] Use menuconfig objects 4 - ISDN part 1/6 (CONFIG_ISDN) Jan Engelhardt
2007-05-30 19:38 ` [PATCH 02/06] Use menuconfig objects 4 - ISDN part 2/6 (CONFIG_ISDN_I4L) Jan Engelhardt
@ 2007-05-30 19:39 ` Jan Engelhardt
2007-05-30 19:40 ` [PATCH 04/06] Use menuconfig objects 4 - ISDN part 4/6 (CONFIG_ISDN_CAPI) Jan Engelhardt
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:39 UTC (permalink / raw)
To: Andrew Morton
Cc: kkeil, Linux Kernel Mailing List, hjlipp, tilman,
gigaset307x-common
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>
---
drivers/isdn/gigaset/Kconfig | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/gigaset/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/gigaset/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/gigaset/Kconfig
@@ -1,6 +1,4 @@
-menu "Siemens Gigaset"
-
-config ISDN_DRV_GIGASET
+menuconfig ISDN_DRV_GIGASET
tristate "Siemens Gigaset support (isdn)"
select CRC_CCITT
select BITREVERSE
@@ -13,11 +11,11 @@ config ISDN_DRV_GIGASET
one of the connection specific parts that follow.
This will build a module called "gigaset".
-if ISDN_DRV_GIGASET!=n
+if ISDN_DRV_GIGASET
config GIGASET_BASE
tristate "Gigaset base station support"
- depends on ISDN_DRV_GIGASET && USB
+ depends on USB
help
Say M here if you want to use the USB interface of the Gigaset
base for connection to your system.
@@ -25,7 +23,7 @@ config GIGASET_BASE
config GIGASET_M105
tristate "Gigaset M105 support"
- depends on ISDN_DRV_GIGASET && USB
+ depends on USB
help
Say M here if you want to connect to the Gigaset base via DECT
using a Gigaset M105 (Sinus 45 Data 2) USB DECT device.
@@ -33,7 +31,6 @@ config GIGASET_M105
config GIGASET_M101
tristate "Gigaset M101 support"
- depends on ISDN_DRV_GIGASET
help
Say M here if you want to connect to the Gigaset base via DECT
using a Gigaset M101 (Sinus 45 Data 1) RS232 DECT device.
@@ -53,6 +50,4 @@ config GIGASET_UNDOCREQ
features like configuration mode of M105, say yes. If you
care about your device, say no.
-endif
-
-endmenu
+endif # ISDN_DRV_GIGASET
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 04/06] Use menuconfig objects 4 - ISDN part 4/6 (CONFIG_ISDN_CAPI)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
` (2 preceding siblings ...)
2007-05-30 19:39 ` [PATCH 03/06] Use menuconfig objects 4 - ISDN part 3/6 (CONFIG_ISDN_DRV_GIGASET) Jan Engelhardt
@ 2007-05-30 19:40 ` Jan Engelhardt
2007-05-30 19:40 ` [PATCH 05/06] Use menuconfig objects 4 - ISDN part 5/6 (CONFIG_CAPI_AVM) Jan Engelhardt
2007-05-30 19:41 ` [PATCH 06/06] Use menuconfig objects 4 - ISDN part 6/6 (CONFIG_CAPI_EICON) Jan Engelhardt
5 siblings, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: kkeil, Linux Kernel Mailing List
Transform "depends on" into a simpler if-endif block style dependency.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
---
drivers/isdn/Kconfig | 4 ++++
drivers/isdn/capi/Kconfig | 7 ++-----
drivers/isdn/hardware/Kconfig | 1 -
drivers/isdn/hardware/avm/Kconfig | 13 ++++++-------
drivers/isdn/hardware/eicon/Kconfig | 3 +--
5 files changed, 13 insertions(+), 15 deletions(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/Kconfig
@@ -52,8 +52,12 @@ config ISDN_CAPI
hardware, see <http://www.capi.org/>. This is needed for AVM's set
of active ISDN controllers like B1, T1, M1.
+if ISDN_CAPI
+
source "drivers/isdn/capi/Kconfig"
source "drivers/isdn/hardware/Kconfig"
+endif # ISDN_CAPI
+
endif # ISDN
Index: linux-2.6.22-rc3-git1/drivers/isdn/capi/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/capi/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/capi/Kconfig
@@ -3,7 +3,6 @@
#
config ISDN_DRV_AVMB1_VERBOSE_REASON
bool "Verbose reason code reporting"
- depends on ISDN_CAPI
default y
help
If you say Y here, the CAPI drivers will give verbose reasons for
@@ -12,7 +11,6 @@ config ISDN_DRV_AVMB1_VERBOSE_REASON
config CAPI_TRACE
bool "CAPI trace support"
- depends on ISDN_CAPI
default y
help
If you say Y here, the kernelcapi driver can make verbose traces
@@ -23,7 +21,7 @@ config CAPI_TRACE
config ISDN_CAPI_MIDDLEWARE
bool "CAPI2.0 Middleware support (EXPERIMENTAL)"
- depends on ISDN_CAPI && EXPERIMENTAL
+ depends on EXPERIMENTAL
help
This option will enhance the capabilities of the /dev/capi20
interface. It will provide a means of moving a data connection,
@@ -33,7 +31,6 @@ config ISDN_CAPI_MIDDLEWARE
config ISDN_CAPI_CAPI20
tristate "CAPI2.0 /dev/capi support"
- depends on ISDN_CAPI
help
This option will provide the CAPI 2.0 interface to userspace
applications via /dev/capi20. Applications should use the
@@ -56,7 +53,7 @@ config ISDN_CAPI_CAPIFS
config ISDN_CAPI_CAPIDRV
tristate "CAPI2.0 capidrv interface support"
- depends on ISDN_CAPI && ISDN_I4L
+ depends on ISDN_I4L
help
This option provides the glue code to hook up CAPI driven cards to
the legacy isdn4linux link layer. If you have a card which is
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hardware/Kconfig
@@ -2,7 +2,6 @@
# ISDN hardware drivers
#
comment "CAPI hardware drivers"
- depends on ISDN_CAPI
source "drivers/isdn/hardware/avm/Kconfig"
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/avm/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/avm/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hardware/avm/Kconfig
@@ -3,7 +3,6 @@
#
menu "Active AVM cards"
- depends on ISDN_CAPI!=n
config CAPI_AVM
bool "Support AVM cards"
@@ -12,13 +11,13 @@ config CAPI_AVM
config ISDN_DRV_AVMB1_B1ISA
tristate "AVM B1 ISA support"
- depends on CAPI_AVM && ISDN_CAPI && ISA
+ depends on CAPI_AVM && ISA
help
Enable support for the ISA version of the AVM B1 card.
config ISDN_DRV_AVMB1_B1PCI
tristate "AVM B1 PCI support"
- depends on CAPI_AVM && ISDN_CAPI && PCI
+ depends on CAPI_AVM && PCI
help
Enable support for the PCI version of the AVM B1 card.
@@ -30,14 +29,14 @@ config ISDN_DRV_AVMB1_B1PCIV4
config ISDN_DRV_AVMB1_T1ISA
tristate "AVM T1/T1-B ISA support"
- depends on CAPI_AVM && ISDN_CAPI && ISA
+ depends on CAPI_AVM && ISA
help
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_B1PCMCIA
tristate "AVM B1/M1/M2 PCMCIA support"
- depends on CAPI_AVM && ISDN_CAPI
+ depends on CAPI_AVM
help
Enable support for the PCMCIA version of the AVM B1 card.
@@ -50,14 +49,14 @@ config ISDN_DRV_AVMB1_AVM_CS
config ISDN_DRV_AVMB1_T1PCI
tristate "AVM T1/T1-B PCI support"
- depends on CAPI_AVM && ISDN_CAPI && PCI
+ depends on CAPI_AVM && PCI
help
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_C4
tristate "AVM C4/C2 support"
- depends on CAPI_AVM && ISDN_CAPI && PCI
+ depends on CAPI_AVM && PCI
help
Enable support for the AVM C4/C2 PCI cards.
These cards handle 4/2 BRI ISDN lines (8/4 channels).
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/eicon/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/eicon/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hardware/eicon/Kconfig
@@ -3,7 +3,6 @@
#
menu "Active Eicon DIVA Server cards"
- depends on ISDN_CAPI!=n
config CAPI_EICON
bool "Support Eicon cards"
@@ -32,7 +31,7 @@ config ISDN_DIVAS_PRIPCI
config ISDN_DIVAS_DIVACAPI
tristate "DIVA CAPI2.0 interface support"
- depends on ISDN_DIVAS && ISDN_CAPI
+ depends on ISDN_DIVAS
help
You need this to provide the CAPI interface
for DIVA Server cards.
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 05/06] Use menuconfig objects 4 - ISDN part 5/6 (CONFIG_CAPI_AVM)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
` (3 preceding siblings ...)
2007-05-30 19:40 ` [PATCH 04/06] Use menuconfig objects 4 - ISDN part 4/6 (CONFIG_ISDN_CAPI) Jan Engelhardt
@ 2007-05-30 19:40 ` Jan Engelhardt
2007-05-30 19:41 ` [PATCH 06/06] Use menuconfig objects 4 - ISDN part 6/6 (CONFIG_CAPI_EICON) Jan Engelhardt
5 siblings, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: kkeil, Linux Kernel Mailing List
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>
---
drivers/isdn/hardware/avm/Kconfig | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/avm/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/avm/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hardware/avm/Kconfig
@@ -2,22 +2,22 @@
# ISDN AVM drivers
#
-menu "Active AVM cards"
-
-config CAPI_AVM
- bool "Support AVM cards"
+menuconfig CAPI_AVM
+ bool "Active AVM cards"
help
Enable support for AVM active ISDN cards.
+if CAPI_AVM
+
config ISDN_DRV_AVMB1_B1ISA
tristate "AVM B1 ISA support"
- depends on CAPI_AVM && ISA
+ depends on ISA
help
Enable support for the ISA version of the AVM B1 card.
config ISDN_DRV_AVMB1_B1PCI
tristate "AVM B1 PCI support"
- depends on CAPI_AVM && PCI
+ depends on PCI
help
Enable support for the PCI version of the AVM B1 card.
@@ -29,14 +29,13 @@ config ISDN_DRV_AVMB1_B1PCIV4
config ISDN_DRV_AVMB1_T1ISA
tristate "AVM T1/T1-B ISA support"
- depends on CAPI_AVM && ISA
+ depends on ISA
help
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_B1PCMCIA
tristate "AVM B1/M1/M2 PCMCIA support"
- depends on CAPI_AVM
help
Enable support for the PCMCIA version of the AVM B1 card.
@@ -49,17 +48,16 @@ config ISDN_DRV_AVMB1_AVM_CS
config ISDN_DRV_AVMB1_T1PCI
tristate "AVM T1/T1-B PCI support"
- depends on CAPI_AVM && PCI
+ depends on PCI
help
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
config ISDN_DRV_AVMB1_C4
tristate "AVM C4/C2 support"
- depends on CAPI_AVM && PCI
+ depends on PCI
help
Enable support for the AVM C4/C2 PCI cards.
These cards handle 4/2 BRI ISDN lines (8/4 channels).
-endmenu
-
+endif # CAPI_AVM
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 06/06] Use menuconfig objects 4 - ISDN part 6/6 (CONFIG_CAPI_EICON)
[not found] <200705301906.l4UJ62hC002388@shell0.pdx.osdl.net>
` (4 preceding siblings ...)
2007-05-30 19:40 ` [PATCH 05/06] Use menuconfig objects 4 - ISDN part 5/6 (CONFIG_CAPI_AVM) Jan Engelhardt
@ 2007-05-30 19:41 ` Jan Engelhardt
5 siblings, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-05-30 19:41 UTC (permalink / raw)
To: Andrew Morton; +Cc: kkeil, Linux Kernel Mailing List, mac
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>
---
drivers/isdn/hardware/eicon/Kconfig | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
Index: linux-2.6.22-rc3-git1/drivers/isdn/hardware/eicon/Kconfig
===================================================================
--- linux-2.6.22-rc3-git1.orig/drivers/isdn/hardware/eicon/Kconfig
+++ linux-2.6.22-rc3-git1/drivers/isdn/hardware/eicon/Kconfig
@@ -2,51 +2,50 @@
# ISDN DIVAS Eicon driver
#
-menu "Active Eicon DIVA Server cards"
-
-config CAPI_EICON
- bool "Support Eicon cards"
+menuconfig CAPI_EICON
+ bool "Active Eicon DIVA Server cards"
help
Enable support for Eicon Networks active ISDN cards.
+if CAPI_EICON
+
config ISDN_DIVAS
tristate "Support Eicon DIVA Server cards"
- depends on CAPI_EICON && PROC_FS && PCI
+ depends on PROC_FS && PCI
help
Say Y here if you have an Eicon Networks DIVA Server PCI ISDN card.
In order to use this card, additional firmware is necessary, which
has to be downloaded into the card using the divactrl utility.
+if ISDN_DIVAS
+
config ISDN_DIVAS_BRIPCI
bool "DIVA Server BRI/PCI support"
- depends on ISDN_DIVAS
help
Enable support for DIVA Server BRI-PCI.
config ISDN_DIVAS_PRIPCI
bool "DIVA Server PRI/PCI support"
- depends on ISDN_DIVAS
help
Enable support for DIVA Server PRI-PCI.
config ISDN_DIVAS_DIVACAPI
tristate "DIVA CAPI2.0 interface support"
- depends on ISDN_DIVAS
help
You need this to provide the CAPI interface
for DIVA Server cards.
config ISDN_DIVAS_USERIDI
tristate "DIVA User-IDI interface support"
- depends on ISDN_DIVAS
help
Enable support for user-mode IDI interface.
config ISDN_DIVAS_MAINT
tristate "DIVA Maint driver support"
- depends on ISDN_DIVAS && m
+ depends on m
help
Enable Divas Maintenance driver.
-endmenu
+endif # ISDN_DIVAS
+endif # CAPI_EICON
^ permalink raw reply [flat|nested] 10+ messages in thread