diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-12 03:17:26 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-12 03:17:26 +0100 |
| commit | d1876ba4dead6ace7e9fbf16f83397e6486d0dfe (patch) | |
| tree | ecf9a5b65c51ec3c8fd19a1ebe9cf70aac949aaa /drivers/acpi/button.c | |
| parent | Merge branch 'processor-256' into release (diff) | |
| parent | ACPI: EC: Don't do transaction from GPE handler in poll mode. (diff) | |
| download | linux-d1876ba4dead6ace7e9fbf16f83397e6486d0dfe.tar.xz linux-d1876ba4dead6ace7e9fbf16f83397e6486d0dfe.zip | |
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) device->wakeup.gpe_number, ACPI_GPE_TYPE_WAKE_RUN); acpi_enable_gpe(device->wakeup.gpe_device, - device->wakeup.gpe_number, ACPI_NOT_ISR); + device->wakeup.gpe_number); device->wakeup.state.enabled = 1; } |