From: Jan Engelhardt Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Cc: Adam Belay Cc: Bjorn Helgaas Signed-off-by: Andrew Morton --- drivers/pnp/Kconfig | 11 ++++------- drivers/pnp/isapnp/Kconfig | 2 +- drivers/pnp/pnpbios/Kconfig | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff -puN drivers/pnp/Kconfig~use-menuconfig-objects-pnp drivers/pnp/Kconfig --- a/drivers/pnp/Kconfig~use-menuconfig-objects-pnp +++ a/drivers/pnp/Kconfig @@ -2,9 +2,7 @@ # Plug and Play configuration # -menu "Plug and Play support" - -config PNP +menuconfig PNP bool "Plug and Play support" depends on ISA || ACPI ---help--- @@ -21,15 +19,15 @@ config PNP If unsure, say Y. +if PNP + config PNP_DEBUG bool "PnP Debug Messages" - depends on PNP help Say Y if you want the Plug and Play Layer to print debug messages. This is useful if you are developing a PnP driver or troubleshooting. comment "Protocols" - depends on PNP source "drivers/pnp/isapnp/Kconfig" @@ -37,5 +35,4 @@ source "drivers/pnp/pnpbios/Kconfig" source "drivers/pnp/pnpacpi/Kconfig" -endmenu - +endif # PNP diff -puN drivers/pnp/isapnp/Kconfig~use-menuconfig-objects-pnp drivers/pnp/isapnp/Kconfig --- a/drivers/pnp/isapnp/Kconfig~use-menuconfig-objects-pnp +++ a/drivers/pnp/isapnp/Kconfig @@ -3,7 +3,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on PNP && ISA + depends on ISA help Say Y here if you would like support for ISA Plug and Play devices. Some information is in . diff -puN drivers/pnp/pnpbios/Kconfig~use-menuconfig-objects-pnp drivers/pnp/pnpbios/Kconfig --- a/drivers/pnp/pnpbios/Kconfig~use-menuconfig-objects-pnp +++ a/drivers/pnp/pnpbios/Kconfig @@ -3,7 +3,7 @@ # config PNPBIOS bool "Plug and Play BIOS support (EXPERIMENTAL)" - depends on PNP && ISA && X86 && EXPERIMENTAL + depends on ISA && X86 && EXPERIMENTAL default n ---help--- Linux uses the PNPBIOS as defined in "Plug and Play BIOS _