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 /include/acpi | |
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 'include/acpi')
-rw-r--r-- | include/acpi/acpixf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 94d94e126e9f..33bc0e3b1954 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -252,9 +252,9 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type); -acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); +acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); -acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); +acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); |