PM / Hibernate: Separate block_io

[safe/jmp/linux-2.6] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index d7a1016..524e058 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,9 +3,13 @@ ifeq ($(CONFIG_PM_DEBUG),y)
 EXTRA_CFLAGS   +=      -DDEBUG
 endif
 
-obj-y                          := main.o
+obj-$(CONFIG_PM)               += main.o
 obj-$(CONFIG_PM_SLEEP)         += console.o
 obj-$(CONFIG_FREEZER)          += process.o
-obj-$(CONFIG_HIBERNATION)      += swsusp.o disk.o snapshot.o swap.o user.o
+obj-$(CONFIG_SUSPEND)          += suspend.o
+obj-$(CONFIG_PM_TEST_SUSPEND)  += suspend_test.o
+obj-$(CONFIG_HIBERNATION)      += hibernate.o snapshot.o swap.o user.o \
+                                  block_io.o
+obj-$(CONFIG_HIBERNATION_NVS)  += hibernate_nvs.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o