diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:56:08 -0500 |
| commit | d16675e1f1de98cc73ae77c6df26154ffae6230a (patch) | |
| tree | be7ffdaabdaa06f8c917c7a6c9919d4b5fd13a52 /include/linux/acpi.h | |
| parent | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (diff) | |
| parent | 6d5bbf00d251cc73223a71422d69e069dc2e0b8d (diff) | |
| download | kernel_replicant_linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.gz kernel_replicant_linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.tar.bz2 kernel_replicant_linux-d16675e1f1de98cc73ae77c6df26154ffae6230a.zip | |
Merge branch 'suspend-ioremap-cache' into release
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 67c91b4418b0..fa7ed6a983d0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -254,6 +254,15 @@ void __init acpi_old_suspend_ordering(void); void __init acpi_nvs_nosave(void); #endif /* CONFIG_PM_SLEEP */ +#ifdef CONFIG_ACPI_SLEEP +int suspend_nvs_register(unsigned long start, unsigned long size); +#else +static inline int suspend_nvs_register(unsigned long a, unsigned long b) +{ + return 0; +} +#endif + struct acpi_osc_context { char *uuid_str; /* uuid string */ int rev; |