diff options
author | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
commit | e840dfe334b4791af07aadee1b2cf3c7c7363581 (patch) | |
tree | b0f8336f578cb6d3e39399f6714b8ec811536225 /include/linux/acpi.h | |
parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
parent | a1f37788a6d8c037e7d92fe4a0fe9ec0d713b21e (diff) | |
download | linux-stable-e840dfe334b4791af07aadee1b2cf3c7c7363581.tar.gz linux-stable-e840dfe334b4791af07aadee1b2cf3c7c7363581.tar.bz2 linux-stable-e840dfe334b4791af07aadee1b2cf3c7c7363581.zip |
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into tboot
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3f968665899b..104eda758e7f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -371,4 +371,14 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), #endif /* !CONFIG_ACPI */ +#ifdef CONFIG_ACPI +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, + u32 pm1a_ctrl, u32 pm1b_ctrl)); + +acpi_status acpi_os_prepare_sleep(u8 sleep_state, + u32 pm1a_control, u32 pm1b_control); +#else +#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) +#endif + #endif /*_LINUX_ACPI_H*/ |