diff options
author | Colin Ian King <colin.king@canonical.com> | 2010-10-18 09:38:36 +0800 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-10-17 22:55:41 -0400 |
commit | 49b3c1e04e1dd3cd9a428b0d8367193b73e472c1 (patch) | |
tree | 431bb5b6f7069285dd36ac4d6ddd89405137e3d0 /drivers | |
parent | 23ebbf07068f84b7ed119a0bef4a3f0ebb82c894 (diff) | |
download | linux-3.10-49b3c1e04e1dd3cd9a428b0d8367193b73e472c1.tar.gz linux-3.10-49b3c1e04e1dd3cd9a428b0d8367193b73e472c1.tar.bz2 linux-3.10-49b3c1e04e1dd3cd9a428b0d8367193b73e472c1.zip |
ACPICA: Clear PCIEXP_WAKE_STS when clearing ACPI events
When clearing status bits via acpi_hw_clear_acpi_status, also clear
the PCIEXP_WAKE_STS bit. Original change from Colin King.
ACPICA BZ 880.
http://www.acpica.org/bugzilla/show_bug.cgi?id=880
http://bugs.launchpad.net/bugs/613381
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 1bb18c0d088..8acf1e8e479 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -854,6 +854,7 @@ struct acpi_bit_register_info { ACPI_BITMASK_POWER_BUTTON_STATUS | \ ACPI_BITMASK_SLEEP_BUTTON_STATUS | \ ACPI_BITMASK_RT_CLOCK_STATUS | \ + ACPI_BITMASK_PCIEXP_WAKE_STATUS | \ ACPI_BITMASK_WAKE_STATUS) #define ACPI_BITMASK_TIMER_ENABLE 0x0001 |