]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)
1  2 
drivers/acpi/acpica/hwsleep.c
drivers/acpi/osl.c
include/linux/acpi.h

Simple merge
Simple merge
index 3f968665899b9cadeef825dab03666d04eac3c64,fccd017b8b6e85ac1dbc4395d8f5a8eab8e57f67..104eda758e7f27dacb9446a33c7f26dde31c2493
@@@ -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*/