diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
| commit | d16675e1f1de98cc73ae77c6df26154ffae6230a (patch) | |
| tree | be7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52 /drivers/acpi/internal.h | |
| parent | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (diff) | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | talos-obmc-linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.gz talos-obmc-linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.zip | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 8 |
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_ */ |
