From 3e3030dbb32bbcb805ed4cd7602b3430b774e0f9 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 12 Feb 2011 01:39:53 +0100
Subject: [PATCH] --- yaml --- r: 233309 b: refs/heads/master c:
 2a5d24286e8bdafdc272b37ec5bdd9e977b3767c h: refs/heads/master i:   233307:
 d6cb193527613fda35fbed7fb7275d6c15fe083c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/acpi/wakeup.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9a4f7019b44..40c84304f064 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d55951368faa32ff098398c56780ebb6405a3d9
+refs/heads/master: 2a5d24286e8bdafdc272b37ec5bdd9e977b3767c
diff --git a/trunk/drivers/acpi/wakeup.c b/trunk/drivers/acpi/wakeup.c
index ed6501452507..7bfbe40bc43b 100644
--- a/trunk/drivers/acpi/wakeup.c
+++ b/trunk/drivers/acpi/wakeup.c
@@ -86,8 +86,12 @@ int __init acpi_wakeup_device_init(void)
 		struct acpi_device *dev = container_of(node,
 						       struct acpi_device,
 						       wakeup_list);
-		if (device_can_wakeup(&dev->dev))
+		if (device_can_wakeup(&dev->dev)) {
+			/* Button GPEs are supposed to be always enabled. */
+			acpi_enable_gpe(dev->wakeup.gpe_device,
+					dev->wakeup.gpe_number);
 			device_set_wakeup_enable(&dev->dev, true);
+		}
 	}
 	mutex_unlock(&acpi_device_lock);
 	return 0;