Merge branch 'pnp-debug' into test

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5d1526cb9cc72ab47a61e21f41f256c002578561..533199bdb92a07e557380cf3651d84a9527387c2 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1687,6 +1687,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        Override pmtimer IOPort with a hex value.
                        e.g. pmtmr=0x508
 
+       pnp.debug       [PNP]
+                       Enable PNP debug messages.  This depends on the
+                       CONFIG_PNP_DEBUG_MESSAGES option.
+
        pnpacpi=        [ACPI]
                        { off }