Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[karo-tx-linux.git] / drivers / base / power / Makefile

diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 06a86fe6a78d77a1c2d0a3b7e84003456c430933..911208b892593965857211727a51b028cbd4b10f 100644 (file)
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,10 +1,6 @@
 obj-$(CONFIG_PM)       += sysfs.o
 obj-$(CONFIG_PM_SLEEP) += main.o
-obj-$(CONFIG_PM_TRACE) += trace.o
+obj-$(CONFIG_PM_TRACE_RTC)     += 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