aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-01-12 22:03:20 +0100
committerLen Brown <len.brown@intel.com>2011-01-12 16:11:30 -0500
commit6fed05c9c9812b5882bc708f4da4fa8d5df2875c (patch)
treea9ad3082384d42b39110141ac85bfdf37bf5338c /drivers/acpi
parent6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff)
downloadkernel_samsung_tuna-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.zip
kernel_samsung_tuna-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.gz
kernel_samsung_tuna-6fed05c9c9812b5882bc708f4da4fa8d5df2875c.tar.bz2
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')
-rw-r--r--drivers/acpi/internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 7c23b76..6d69bbe 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