Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / acpi / wakeup.c

diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index f252d0d..ed65014 100644 (file)
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -46,7 +46,7 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
                        acpi_enable_wakeup_device_power(dev, sleep_state);
 
                /* The wake-up power should have been enabled already. */
-               acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+               acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                ACPI_GPE_ENABLE);
        }
 }
@@ -69,7 +69,7 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
                        || dev->wakeup.prepare_count))
                        continue;
 
-               acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+               acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                ACPI_GPE_DISABLE);
 
                if (device_may_wakeup(&dev->dev))