summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:28:43 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:28:43 -0400
commit4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841 (patch)
tree2b80f6f9d3b5b1ff4600810c4a30917b2d66b7ab /Documentation
parent5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (diff)
parentac88a8f3f7df04774b386ddaf586040adb819b58 (diff)
downloadlinux-3.10-4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841.tar.gz
linux-3.10-4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841.tar.bz2
linux-3.10-4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841.zip
Merge branch 'pnp-debug' into test
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5d1526cb9cc..533199bdb92 100644
--- 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 }