lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'suspend-ioremap-cache' into release

Browse Source
This commit is contained in:
Len Brown
2011-01-12 04:56:08 -05:00
parent fb4af417cc 6d5bbf00d2
commit d16675e1f1
11 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/internal.h
View File

@@ -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_ */