From: Len Brown <len.brown@intel.com>
Date: Thu, 22 Mar 2012 05:31:09 +0000 (-0400)
Subject: Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: accepted/tizen/common/20141203.182822~4942^2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e840dfe334b4791af07aadee1b2cf3c7c7363581;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'stable/for-x86-for-3.4' of git://git./linux/kernel/git/konrad/xen into tboot
---

e840dfe334b4791af07aadee1b2cf3c7c7363581
diff --cc include/linux/acpi.h
index 3f96866,fccd017..104eda7
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -362,13 -357,16 +362,23 @@@ static inline int acpi_nvs_register(__u
  {
  	return 0;
  }
 -#endif
 +
 +static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
 +					   void *data)
 +{
 +	return 0;
 +}
 +
 +#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*/