3 files changed, 7 insertions, 10 deletions

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 1959cef8e9de..821933f9aa57 100644
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -2,11 +2,9 @@
 # Plug and Play configuration
 #
 
-menu "Plug and Play support"
-        depends on HAS_IOMEM
-
-config PNP
+menuconfig PNP
         bool "Plug and Play support"
+        depends on HAS_IOMEM
         depends on ISA || ACPI
         ---help---
           Plug and Play (PnP) is a standard for peripherals which allows those
@@ -22,15 +20,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"
 
@@ -38,5 +36,4 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
 
-endmenu
-
+endif # PNP
diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig
index 578651eeb4b0..f1ef36673ad4 100644
--- a/drivers/pnp/isapnp/Kconfig
+++ b/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 <file:Documentation/isapnp.txt>.
diff --git a/drivers/pnp/pnpbios/Kconfig b/drivers/pnp/pnpbios/Kconfig
index fab848cae89d..b986d9fa3b9a 100644
--- a/drivers/pnp/pnpbios/Kconfig
+++ b/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