From: Jan Engelhardt 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 Cc: Karsten Keil Signed-off-by: Andrew Morton --- drivers/isdn/Kconfig | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff -puN drivers/isdn/Kconfig~use-menuconfig-objects-ii-isdn drivers/isdn/Kconfig --- a/drivers/isdn/Kconfig~use-menuconfig-objects-ii-isdn +++ a/drivers/isdn/Kconfig @@ -2,11 +2,9 @@ # ISDN device configuration # -menu "ISDN subsystem" - depends on !S390 - -config ISDN +menuconfig ISDN tristate "ISDN support" + depends on !S390 depends on NET ---help--- ISDN ("Integrated Services Digital Networks", called RNIS in France) @@ -22,11 +20,11 @@ config ISDN Select this option if you want your kernel to support ISDN. -menu "Old ISDN4Linux" - depends on NET && ISDN +if ISDN -config ISDN_I4L +menuconfig ISDN_I4L tristate "Old ISDN4Linux (obsolete)" + depends on NET ---help--- This driver allows you to use an ISDN-card for networking connections and as dialin/out device. The isdn-tty's have a built @@ -46,14 +44,11 @@ if ISDN_I4L source "drivers/isdn/i4l/Kconfig" endif -endmenu - comment "CAPI subsystem" - depends on NET && ISDN + depends on NET 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 +59,4 @@ source "drivers/isdn/capi/Kconfig" source "drivers/isdn/hardware/Kconfig" -endmenu - +endif # ISDN _