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 /arch | |
| 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 'arch')
| -rw-r--r-- | arch/x86/kernel/e820.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 0c2b7ef7a34d..294f26da0c0c 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/bootmem.h> |
| 15 | #include <linux/pfn.h> | 15 | #include <linux/pfn.h> |
| 16 | #include <linux/suspend.h> | 16 | #include <linux/suspend.h> |
| 17 | #include <linux/acpi.h> | ||
| 17 | #include <linux/firmware-map.h> | 18 | #include <linux/firmware-map.h> |
| 18 | #include <linux/memblock.h> | 19 | #include <linux/memblock.h> |
| 19 | 20 | ||