Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6-omap-h63xx.git] / drivers / pnp / Kconfig

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 1959cef8e9debc6e613882ebfd06427ecab929d2..2a37b3fedb8e619d203c1a277c5a9e831da389cc 100644 (file)
--- 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,23 @@ config PNP
 
          If unsure, say Y.
 
-config PNP_DEBUG
-       bool "PnP Debug Messages"
+config PNP_DEBUG_MESSAGES
+       default y
+       bool "PNP debugging 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.
+         Say Y here if you want the PNP layer to be able to produce debugging
+         messages if needed.  The messages can be enabled at boot-time with
+         the pnp.debug kernel parameter.
+
+         This option allows you to save a bit of space if you do not want
+         the messages to even be built into the kernel.
+
+         If you have any doubts about this, say Y here.
+
+if PNP
 
 comment "Protocols"
-       depends on PNP
 
 source "drivers/pnp/isapnp/Kconfig"
 
@@ -38,5 +44,4 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
 
-endmenu
-
+endif # PNP