diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-07 01:43:44 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 00:36:55 -0500 |
| commit | 976513dbfc1547c7b1822566923058655f0c32fd (patch) | |
| tree | 561e658e65a0136691cc9faebbe1ddf17a3429d3 /drivers/acpi/internal.h | |
| parent | 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 (diff) | |
| download | lwn-976513dbfc1547c7b1822566923058655f0c32fd.tar.gz lwn-976513dbfc1547c7b1822566923058655f0c32fd.zip | |
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 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index a212bfeddf8c..7c23b76e8eca 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -82,8 +82,16 @@ extern int acpi_sleep_init(void); #ifdef CONFIG_ACPI_SLEEP int acpi_sleep_proc_init(void); +int suspend_nvs_alloc(void); +void suspend_nvs_free(void); +int suspend_nvs_save(void); +void suspend_nvs_restore(void); #else static inline int acpi_sleep_proc_init(void) { return 0; } +static inline int suspend_nvs_alloc(void) { return 0; } +static inline void suspend_nvs_free(void) {} +static inline int suspend_nvs_save(void) {} +static inline void suspend_nvs_restore(void) {} #endif #endif /* _ACPI_INTERNAL_H_ */ |