From: Len Brown <len.brown@intel.com>
Date: Sun, 15 Aug 2010 04:25:40 +0000 (-0400)
Subject: Merge branch 'acpica-gpe' into release
X-Git-Tag: v2.6.36-rc1~1^2~8
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=c172cb73bc79fe69915b1a1a48e374aa4b1f8a59

Merge branch 'acpica-gpe' into release
---

c172cb73bc79fe69915b1a1a48e374aa4b1f8a59
diff --cc drivers/acpi/wakeup.c
index dc6d1d9112f,c80537bc323..f62a50c3ed3
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@@ -40,12 -69,9 +41,12 @@@ void acpi_enable_wakeup_devices(u8 slee
  		    || sleep_state > (u32) dev->wakeup.sleep_state)
  			continue;
  
 +		if (dev->wakeup.state.enabled)
 +			acpi_enable_wakeup_device_power(dev, sleep_state);
 +
  		/* The wake-up power should have been enabled already. */
- 		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
- 				ACPI_GPE_TYPE_WAKE);
+ 		acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ 				ACPI_GPE_ENABLE);
  	}
  }