[PATCH 12/36] Use menuconfig objects II - ISDN

From: Jan Engelhardt
Date: Mon Apr 30 2007 - 07:38:30 EST

Change Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to
enter the menu first.

In this patch, CONFIG_ISDN is also changed from a tristate to bool,
since no Makefile uses obj-$(CONFIG_ISDN) that could possibly
produce a module out of CONFIG_ISDN. So CONFIG_ISDN=y and
CONFIG_ISDN=m would do the same, in which case only allowing yes/no
seems 'nicer' to me. The submodules in the ISDN menu can still be
built as modules, as usual.

CAUTION: Everyone who has CONFIG_ISDN set to 'm' will get it set to
'n'(!), so either everyone (including defconfig maintainers) should keep
an eye open, or I need to come up with a patch that changes kconfig to
just downgrade m->y in such cases.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>

drivers/isdn/Kconfig | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)

--- linux-2.6.21-mm_20070428.orig/drivers/isdn/Kconfig
+++ linux-2.6.21-mm_20070428/drivers/isdn/Kconfig
@@ -2,10 +2,8 @@
# ISDN device configuration

-menu "ISDN subsystem"
-config ISDN
- tristate "ISDN support"
+menuconfig ISDN
+ bool "ISDN support"
depends on NET
ISDN ("Integrated Services Digital Networks", called RNIS in France)
@@ -20,12 +18,11 @@ 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
+menuconfig ISDN_I4L
tristate "Old ISDN4Linux subsystem"
+ depends on NET
This driver allows you to use an ISDN adapter for networking
connections and as dialin/out device. The isdn-tty's have a built
@@ -46,14 +43,11 @@ if ISDN_I4L
source "drivers/isdn/i4l/Kconfig"

comment "CAPI subsystem"
- depends on NET && ISDN
+ depends on NET

config ISDN_CAPI
tristate "CAPI2.0 support"
- depends on ISDN
This provides the CAPI (Common ISDN Application Programming
Interface, a standard making it easy for programs to access ISDN
@@ -64,5 +58,4 @@ source "drivers/isdn/capi/Kconfig"

source "drivers/isdn/hardware/Kconfig"

+endif # ISDN
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/