diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
| commit | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b (patch) | |
| tree | f624579c4c27e1ffcba5e4141fcc0877c3a6ae56 /kernel/power/Makefile | |
| parent | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (diff) | |
| parent | 2a6b69765ad794389f2fc3e14a0afa1a995221c2 (diff) | |
Merge branch 'bugzilla-13931-sleep-nvs' into release
Conflicts:
drivers/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 524e058dcf06..f9063c6b185d 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile | |||
| @@ -10,6 +10,6 @@ obj-$(CONFIG_SUSPEND) += suspend.o | |||
| 10 | obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o | 10 | obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o |
| 11 | obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \ | 11 | obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \ |
| 12 | block_io.o | 12 | block_io.o |
| 13 | obj-$(CONFIG_HIBERNATION_NVS) += hibernate_nvs.o | 13 | obj-$(CONFIG_SUSPEND_NVS) += nvs.o |
| 14 | 14 | ||
| 15 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o | 15 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |