diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-12 22:03:20 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 16:11:30 -0500 |
| commit | 6fed05c9c9812b5882bc708f4da4fa8d5df2875c (patch) | |
| tree | a9ad3082384d42b39110141ac85bfdf37bf5338c /drivers/acpi/internal.h | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | linux-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.gz linux-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.bz2 linux-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.zip | |
ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
The recent rework of the NVS saving/restoring code introduced two
build issues for !CONFIG_ACPI, a warning in drivers/acpi/internal.h
and an error in arch/x86/kernel/e820.c.
Fix them by providing suitable static inline definitions of the
relevant functions.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 7c23b76e8eca..6d69bbedf97a 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -90,7 +90,7 @@ void suspend_nvs_restore(void); 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 int suspend_nvs_save(void) { return 0; } static inline void suspend_nvs_restore(void) {} #endif |