diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpixf.h | 6 | ||||
-rw-r--r-- | include/acpi/actypes.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 17396e83e1a4..354d785e80cb 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -284,11 +284,9 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); | |||
284 | */ | 284 | */ |
285 | acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action); | 285 | acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action); |
286 | 286 | ||
287 | acpi_status | 287 | acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); |
288 | acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type); | ||
289 | 288 | ||
290 | acpi_status | 289 | acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); |
291 | acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type); | ||
292 | 290 | ||
293 | acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number); | 291 | acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number); |
294 | 292 | ||
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 6a65a94897bf..a42513ded3a4 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -669,12 +669,6 @@ typedef u32 acpi_event_status; | |||
669 | #define ACPI_GPE_DISABLE 1 | 669 | #define ACPI_GPE_DISABLE 1 |
670 | #define ACPI_GPE_COND_ENABLE 2 | 670 | #define ACPI_GPE_COND_ENABLE 2 |
671 | 671 | ||
672 | /* gpe_types for acpi_enable_gpe and acpi_disable_gpe */ | ||
673 | |||
674 | #define ACPI_GPE_TYPE_WAKE (u8) 0x01 | ||
675 | #define ACPI_GPE_TYPE_RUNTIME (u8) 0x02 | ||
676 | #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x03 | ||
677 | |||
678 | /* | 672 | /* |
679 | * GPE info flags - Per GPE | 673 | * GPE info flags - Per GPE |
680 | * +-------+---+-+-+ | 674 | * +-------+---+-+-+ |