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 /include/acpi | |
| parent | 547f7847472c097a54adf38e6576f95ab512e27c (diff) | |
| parent | 8517934ef6aaa28d6e055b98df65b31cedbd1372 (diff) | |
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); | |||
| 252 | 252 | ||
| 253 | acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type); | 253 | acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type); |
| 254 | 254 | ||
| 255 | acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); | 255 | acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); |
| 256 | 256 | ||
| 257 | acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); | 257 | acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); |
| 258 | 258 | ||
| 259 | acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); | 259 | acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags); |
| 260 | 260 | ||