diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-06 19:43:44 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 00:36:55 -0500 |
| commit | 976513dbfc1547c7b1822566923058655f0c32fd (patch) | |
| tree | 561e658e65a0136691cc9faebbe1ddf17a3429d3 /kernel/power/Makefile | |
| parent | 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 (diff) | |
PM / ACPI: Move NVS saving and restoring code to drivers/acpi
The saving of the ACPI NVS area during hibernation and suspend and
restoring it during the subsequent resume is entirely specific to
ACPI, so move it to drivers/acpi and drop the CONFIG_SUSPEND_NVS
configuration option which is redundant.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index f9063c6b185d..120a15823325 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile | |||
| @@ -10,6 +10,5 @@ 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_SUSPEND_NVS) += nvs.o | ||
| 14 | 13 | ||
| 15 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o | 14 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |