Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / acpi / button.c

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 7d857dabdde44ad8085737591be907c49b3fbf4e..1575a9b51f1d9e1dfb0e16efb65bf31f60bcb506 100644 (file)
--- 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;
        }