Merge branch 'linus' into stackprotector

[linux-2.6] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 8d0af3d..597823b 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,10 +3,8 @@ ifeq ($(CONFIG_PM_DEBUG),y)
 EXTRA_CFLAGS   +=      -DDEBUG
 endif
 
-obj-y                          := main.o process.o console.o
-obj-$(CONFIG_PM_LEGACY)                += pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o swap.o user.o
-
-obj-$(CONFIG_SUSPEND_SMP)      += smp.o
+obj-y                          := main.o
+obj-$(CONFIG_PM_SLEEP)         += process.o console.o
+obj-$(CONFIG_HIBERNATION)      += swsusp.o disk.o snapshot.o swap.o user.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o