diff --git a/[refs] b/[refs]
index bf735d85b65c..ad3a624a6dec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7fe4a60f3a5a428832bf5dd9388e80f0d02fc2e
+refs/heads/master: 05967118a6c354eaa5950429c70ad4c8daca94bf
diff --git a/trunk/drivers/base/power/Makefile b/trunk/drivers/base/power/Makefile
index c0219ad94aca..ceeeba2c56c7 100644
--- a/trunk/drivers/base/power/Makefile
+++ b/trunk/drivers/base/power/Makefile
@@ -4,3 +4,6 @@ obj-$(CONFIG_PM)	+= main.o suspend.o resume.o runtime.o sysfs.o
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
+ifeq ($(CONFIG_PM_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif