Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes

[~andy/linux] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 720ea4f781bd4896ef8922b9e55442f447967ab5..c3b81c30e5d57627f082f66a70a7b464d63c412d 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -6,6 +6,9 @@ endif
 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)      += swsusp.o hibernate.o snapshot.o swap.o user.o
+obj-$(CONFIG_HIBERNATION_NVS)  += hibernate_nvs.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o