diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:26 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:26 -0500 |
| commit | d1876ba4dead6ace7e9fbf16f83397e6486d0dfe (patch) | |
| tree | ecf9a5b65c51ec3c8fd19a1ebe9cf70aac949aaa /drivers/acpi/button.c | |
| parent | 547f7847472c097a54adf38e6576f95ab512e27c (diff) | |
| parent | 8517934ef6aaa28d6e055b98df65b31cedbd1372 (diff) | |
Merge branch 'ec' into release
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index fd7ca289cb02..171fd914f435 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -478,7 +478,7 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 478 | device->wakeup.gpe_number, | 478 | device->wakeup.gpe_number, |
| 479 | ACPI_GPE_TYPE_WAKE_RUN); | 479 | ACPI_GPE_TYPE_WAKE_RUN); |
| 480 | acpi_enable_gpe(device->wakeup.gpe_device, | 480 | acpi_enable_gpe(device->wakeup.gpe_device, |
| 481 | device->wakeup.gpe_number, ACPI_NOT_ISR); | 481 | device->wakeup.gpe_number); |
| 482 | device->wakeup.state.enabled = 1; | 482 | device->wakeup.state.enabled = 1; |
| 483 | } | 483 | } |
| 484 | 484 | ||