The patch titled
     PM: Do not require dev spew to get PM_DEBUG
has been added to the -mm tree.  Its filename is
     pm-do-not-require-dev-spew-to-get-pm_debug.patch

 drivers/base/power/Makefile |    2 +-
 kernel/power/Kconfig        |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

Index: linux-2.6.22-rc7/drivers/base/power/Makefile
===================================================================
--- linux-2.6.22-rc7.orig/drivers/base/power/Makefile	2007-07-02 08:53:42.000000000 +0200
+++ linux-2.6.22-rc7/drivers/base/power/Makefile	2007-07-02 08:56:50.000000000 +0200
@@ -5,6 +5,6 @@ obj-$(CONFIG_PM_TRACE)	+= trace.o
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
-ifeq ($(CONFIG_PM_DEBUG),y)
+ifeq ($(CONFIG_PM_VERBOSE),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
Index: linux-2.6.22-rc7/kernel/power/Kconfig
===================================================================
--- linux-2.6.22-rc7.orig/kernel/power/Kconfig	2007-07-02 08:56:08.000000000 +0200
+++ linux-2.6.22-rc7/kernel/power/Kconfig	2007-07-02 08:56:50.000000000 +0200
@@ -33,13 +33,20 @@ config PM_DEBUG
 	bool "Power Management Debug Support"
 	depends on PM
 	---help---
-	This option enables verbose debugging support in the Power Management
-	code. This is helpful when debugging and reporting various PM bugs, 
-	like suspend support.
+	This option enables various debugging support in the Power Management
+	code. This is helpful when debugging and reporting PM bugs, like
+	suspend support.
+
+config PM_VERBOSE
+	bool "Verbose Power Management debugging"
+	depends on PM_DEBUG
+	default n
+	---help---
+	This option enables verbose messages from the Power Management code.
 
 config DISABLE_CONSOLE_SUSPEND
 	bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
-	depends on PM && PM_DEBUG
+	depends on PM_DEBUG
 	default n
 	---help---
 	This option turns off the console suspend mechanism that prevents
@@ -50,7 +57,7 @@ config DISABLE_CONSOLE_SUSPEND
 
 config PM_TRACE
 	bool "Suspend/resume event tracing"
-	depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
+	depends on PM_DEBUG && X86_32 && EXPERIMENTAL
 	default n
 	---help---
 	This enables some cheesy code to save the last PM event point in the