diff --git a/[refs] b/[refs]
index 2f3b936649b7..b62a3263f8a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 800074345544ae6ec06c77b1a3f7ba032f84bd10
+refs/heads/master: 9e233625fbee1f977929a5406533b96011f1a06b
diff --git a/trunk/drivers/base/power/Makefile b/trunk/drivers/base/power/Makefile
index 06a86fe6a78d..de28dfd3b96c 100644
--- a/trunk/drivers/base/power/Makefile
+++ b/trunk/drivers/base/power/Makefile
@@ -2,9 +2,5 @@ obj-$(CONFIG_PM)	+= sysfs.o
 obj-$(CONFIG_PM_SLEEP)	+= main.o
 obj-$(CONFIG_PM_TRACE)	+= trace.o
 
-ifeq ($(CONFIG_DEBUG_DRIVER),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
-ifeq ($(CONFIG_PM_VERBOSE),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
+ccflags-$(CONFIG_PM_VERBOSE)   += -DDEBUG