diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
| commit | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b (patch) | |
| tree | f624579c4c27e1ffcba5e4141fcc0877c3a6ae56 /include | |
| parent | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (diff) | |
| parent | 2a6b69765ad794389f2fc3e14a0afa1a995221c2 (diff) | |
| download | op-kernel-dev-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.zip op-kernel-dev-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.tar.gz | |
Merge branch 'bugzilla-13931-sleep-nvs' into release
Conflicts:
drivers/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/suspend.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 5e781d8..bc7d6bb 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -256,22 +256,22 @@ static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -#ifdef CONFIG_HIBERNATION_NVS -extern int hibernate_nvs_register(unsigned long start, unsigned long size); -extern int hibernate_nvs_alloc(void); -extern void hibernate_nvs_free(void); -extern void hibernate_nvs_save(void); -extern void hibernate_nvs_restore(void); -#else /* CONFIG_HIBERNATION_NVS */ -static inline int hibernate_nvs_register(unsigned long a, unsigned long b) +#ifdef CONFIG_SUSPEND_NVS +extern int suspend_nvs_register(unsigned long start, unsigned long size); +extern int suspend_nvs_alloc(void); +extern void suspend_nvs_free(void); +extern void suspend_nvs_save(void); +extern void suspend_nvs_restore(void); +#else /* CONFIG_SUSPEND_NVS */ +static inline int suspend_nvs_register(unsigned long a, unsigned long b) { return 0; } -static inline int hibernate_nvs_alloc(void) { return 0; } -static inline void hibernate_nvs_free(void) {} -static inline void hibernate_nvs_save(void) {} -static inline void hibernate_nvs_restore(void) {} -#endif /* CONFIG_HIBERNATION_NVS */ +static inline int suspend_nvs_alloc(void) { return 0; } +static inline void suspend_nvs_free(void) {} +static inline void suspend_nvs_save(void) {} +static inline void suspend_nvs_restore(void) {} +#endif /* CONFIG_SUSPEND_NVS */ #ifdef CONFIG_PM_SLEEP void save_processor_state(void); |
