summaryrefslogtreecommitdiff
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
parenteab001bf88f68653e87a7d90124a2241131dbeda (diff)
parent6fed05c9c9812b5882bc708f4da4fa8d5df2875c (diff)
Merge branch 'suspend-ioremap-cache' into release
-rw-r--r--drivers/acpi/internal.h2
-rw-r--r--include/linux/acpi.h19
2 files changed, 11 insertions, 10 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
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fa7ed6a983d0..eb176bb1b15b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -254,15 +254,6 @@ void __init acpi_old_suspend_ordering(void);
void __init acpi_nvs_nosave(void);
#endif /* CONFIG_PM_SLEEP */
-#ifdef CONFIG_ACPI_SLEEP
-int suspend_nvs_register(unsigned long start, unsigned long size);
-#else
-static inline int suspend_nvs_register(unsigned long a, unsigned long b)
-{
- return 0;
-}
-#endif
-
struct acpi_osc_context {
char *uuid_str; /* uuid string */
int rev;
@@ -361,4 +352,14 @@ static inline int acpi_table_parse(char *id,
return -1;
}
#endif /* !CONFIG_ACPI */
+
+#ifdef CONFIG_ACPI_SLEEP
+int suspend_nvs_register(unsigned long start, unsigned long size);
+#else
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+ return 0;
+}
+#endif
+
#endif /*_LINUX_ACPI_H*/