diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 16:11:46 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 16:11:46 -0500 |
| commit | 4263d9a3ae4d15785897d0543bb59316c84ee605 (patch) | |
| tree | e15665d7179d8355079312ac7e6d72d504c9561d /drivers/acpi | |
| parent | eab001bf88f68653e87a7d90124a2241131dbeda (diff) | |
| parent | 6fed05c9c9812b5882bc708f4da4fa8d5df2875c (diff) | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
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); | |||
| 91 | static inline int acpi_sleep_proc_init(void) { return 0; } | 91 | static inline int acpi_sleep_proc_init(void) { return 0; } |
| 92 | static inline int suspend_nvs_alloc(void) { return 0; } | 92 | static inline int suspend_nvs_alloc(void) { return 0; } |
| 93 | static inline void suspend_nvs_free(void) {} | 93 | static inline void suspend_nvs_free(void) {} |
| 94 | static inline int suspend_nvs_save(void) {} | 94 | static inline int suspend_nvs_save(void) { return 0; } |
| 95 | static inline void suspend_nvs_restore(void) {} | 95 | static inline void suspend_nvs_restore(void) {} |
| 96 | #endif | 96 | #endif |
| 97 | 97 | ||