Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index fbdc634135a765a90b04eb224c2c38126747340c..f7dfff28ecdb7035d290a3f7a9e8649283b5d222 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,9 +3,9 @@ ifeq ($(CONFIG_PM_DEBUG),y)
 EXTRA_CFLAGS   +=      -DDEBUG
 endif
 
-swsusp-smp-$(CONFIG_SMP)       += smp.o
-
-obj-y                          := main.o process.o console.o pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o $(swsusp-smp-y) disk.o
+obj-y                          := main.o
+obj-$(CONFIG_PM_LEGACY)                += pm.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