Merge branch 'acpica-gpe' into release

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 7d857dabdde4..1575a9b51f1d 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -424,8 +424,7 @@ static int acpi_button_add(struct acpi_device *device)
         if (device->wakeup.flags.valid) {
                 /* Button's GPE is run-wake GPE */
                 acpi_enable_gpe(device->wakeup.gpe_device,
-                                device->wakeup.gpe_number,
-                                ACPI_GPE_TYPE_RUNTIME);
+                                device->wakeup.gpe_number);
                 device->wakeup.run_wake_count++;
                 device->wakeup.state.enabled = 1;
         }
@@ -448,8 +447,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 
         if (device->wakeup.flags.valid) {
                 acpi_disable_gpe(device->wakeup.gpe_device,
-                                device->wakeup.gpe_number,
-                                ACPI_GPE_TYPE_RUNTIME);
+                                device->wakeup.gpe_number);
                 device->wakeup.run_wake_count--;
                 device->wakeup.state.enabled = 0;
         }