Merge branch 'pnp-debug' into test

2008-10-22 23:28:43 -04:00
parent 5f50ef453d ac88a8f3f7
commit 4dff4e7f6c
19 changed files with 121 additions and 125 deletions
--- 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 }