diff options
author | Matthew Garrett <mjg@redhat.com> | 2010-05-28 16:32:14 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-06-10 11:02:34 -0400 |
commit | dd4c4f17d722ffeb2515bf781400675a30fcead7 (patch) | |
tree | 0190eff340ffeac7800a3d7d1e0c1232c09397ef /kernel/power/Makefile | |
parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
download | op-kernel-dev-dd4c4f17d722ffeb2515bf781400675a30fcead7.zip op-kernel-dev-dd4c4f17d722ffeb2515bf781400675a30fcead7.tar.gz |
suspend: Move NVS save/restore code to generic suspend functionality
Saving platform non-volatile state may be required for suspend to RAM as
well as hibernation. Move it to more generic code.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
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 524e058..f9063c6 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -10,6 +10,6 @@ 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_SUSPEND_NVS) += nvs.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |