diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 22:11:46 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 22:11:46 +0100 |
| commit | 4263d9a3ae4d15785897d0543bb59316c84ee605 (patch) | |
| tree | e15665d7179d8355079312ac7e6d72d504c9561d /drivers/acpi/internal.h | |
| parent | Merge branch 'misc' into test (diff) | |
| parent | ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework (diff) | |
| download | linux-4263d9a3ae4d15785897d0543bb59316c84ee605.tar.xz linux-4263d9a3ae4d15785897d0543bb59316c84ee605.zip | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'drivers/acpi/internal.h')
| -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); 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 |