diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-17 12:18:30 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-17 12:18:30 -0400 |
| commit | 2cebc5e27e18acb2226b22f66b3b1b11deb76aa0 (patch) | |
| tree | a4410e95500370766cb721acfa5cf5b68afae535 /drivers/acpi/button.c | |
| parent | c1db9d9bb23814a76cfb2416fd84f32c3fd6d82f (diff) | |
| parent | cb1cb1780f2025a7d612de09131bf6530f80fb1a (diff) | |
Merge branch 'bugzilla-15951' into release
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index fd51c4ab482..7d857dabdde 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -425,7 +425,7 @@ static int acpi_button_add(struct acpi_device *device) /* Button's GPE is run-wake GPE */ acpi_enable_gpe(device->wakeup.gpe_device, device->wakeup.gpe_number, - ACPI_GPE_TYPE_WAKE_RUN); + ACPI_GPE_TYPE_RUNTIME); device->wakeup.run_wake_count++; device->wakeup.state.enabled = 1; } @@ -449,7 +449,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_WAKE_RUN); + ACPI_GPE_TYPE_RUNTIME); device->wakeup.run_wake_count--; device->wakeup.state.enabled = 0; } |