Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 2f438d0eaa13640a91ec78acc086c559bc523060..38725f526afc6cff3f2071017daeea536e78f801 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,9 +3,8 @@ ifeq ($(CONFIG_PM_DEBUG),y)
 EXTRA_CFLAGS   +=      -DDEBUG
 endif
 
-obj-y                          := main.o process.o console.o pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o
-
-obj-$(CONFIG_SUSPEND_SMP)      += smp.o
+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_MAGIC_SYSRQ)      += poweroff.o