diff options
author | Len Brown <len.brown@intel.com> | 2008-11-11 21:13:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:13:50 -0500 |
commit | 597e4fabb0b0c7fdfa7c2d551fd0a797aab7e53b (patch) | |
tree | 2864bd6b9a5919698bc497892927849fed53618a /include | |
parent | 3ad4f597058301c97f362e500a32f63f5c950a45 (diff) | |
parent | ed206fac87d65917280b6c3edd3f01125d4095c9 (diff) |
Merge branch 'bugzilla-11312' into release
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/actypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index e8936ab5962..7220361790b 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -525,6 +525,7 @@ typedef u32 acpi_event_status; | |||
525 | #define ACPI_EVENT_FLAG_ENABLED (acpi_event_status) 0x01 | 525 | #define ACPI_EVENT_FLAG_ENABLED (acpi_event_status) 0x01 |
526 | #define ACPI_EVENT_FLAG_WAKE_ENABLED (acpi_event_status) 0x02 | 526 | #define ACPI_EVENT_FLAG_WAKE_ENABLED (acpi_event_status) 0x02 |
527 | #define ACPI_EVENT_FLAG_SET (acpi_event_status) 0x04 | 527 | #define ACPI_EVENT_FLAG_SET (acpi_event_status) 0x04 |
528 | #define ACPI_EVENT_FLAG_HANDLE (acpi_event_status) 0x08 | ||
528 | 529 | ||
529 | /* | 530 | /* |
530 | * General Purpose Events (GPE) | 531 | * General Purpose Events (GPE) |