diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
commit | fe377e8fb3f67d66590e41e99cd6e207d585f7dd (patch) | |
tree | aef88767bd67100120fce449f9b21da433865969 /kernel/power/Makefile | |
parent | 946524efb4912687b6e02e831b5fbedc4c9395c0 (diff) | |
parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) |
Merge commit 'linus/master' into topic/slqb/core
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'kernel/power/Makefile')
-rw-r--r-- | kernel/power/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 720ea4f781bd..c3b81c30e5d5 100644 --- 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 |