summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 16:11:46 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 16:11:46 -0500
commit4263d9a3ae4d15785897d0543bb59316c84ee605 (patch)
treee15665d7179d8355079312ac7e6d72d504c9561d /drivers/acpi
parenteab001bf88f68653e87a7d90124a2241131dbeda (diff)
parent6fed05c9c9812b5882bc708f4da4fa8d5df2875c (diff)
Merge branch 'suspend-ioremap-cache' into release
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 bc428a9607df..b1cc81a0431b 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -91,7 +91,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