summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/internal.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 10:56:08 +0100
committerLen Brown <len.brown@intel.com>2011-01-12 10:56:08 +0100
commitd16675e1f1de98cc73ae77c6df26154ffae6230a (patch)
treebe7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52 /drivers/acpi/internal.h
parentMerge branch 'wakeup-etc-rafael' into release (diff)
parentACPI: Use ioremap_cache() (diff)
downloadlinux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.xz
linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.zip
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r--drivers/acpi/internal.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 8df5d7061a45..bc428a9607df 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -83,8 +83,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_ */