Merge branch 'suspend-ioremap-cache' into release

This commit is contained in:
Len Brown 2011-01-12 16:11:46 -05:00
commit 4263d9a3ae
2 changed files with 11 additions and 10 deletions

View file

@ -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