Enable GPE at runtime rather than suspend time. This is to match the

new behavior in ACPI-CA that defers GPE configuration.  This is a temporary
measure while reworking the GPE interface.

1 files changed, 3 insertions, 1 deletions

diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 121ebec354d7..004a54ed35d7 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -155,6 +155,7 @@ acpi_button_attach(device_t dev)
 	return_VALUE (ENXIO);
     }
     acpi_device_enable_wake_capability(sc->button_handle, 1);
+    acpi_device_enable_wake_event(sc->button_handle);
 
     return_VALUE (0);
 }
@@ -162,10 +163,11 @@ acpi_button_attach(device_t dev)
 static int
 acpi_button_suspend(device_t dev)
 {
+#if 0
     struct acpi_button_softc	*sc;
 
     sc = device_get_softc(dev);
-    acpi_device_enable_wake_event(sc->button_handle);
+#endif
     return (0);
 }