diff options
Diffstat (limited to 'include/acpi/aclocal.h')
-rw-r--r-- | include/acpi/aclocal.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index 97f8e4185e4f..8361820d2970 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h | |||
@@ -416,13 +416,13 @@ struct acpi_field_info { | |||
416 | #define ACPI_CONTROL_PREDICATE_FALSE 0xC3 | 416 | #define ACPI_CONTROL_PREDICATE_FALSE 0xC3 |
417 | #define ACPI_CONTROL_PREDICATE_TRUE 0xC4 | 417 | #define ACPI_CONTROL_PREDICATE_TRUE 0xC4 |
418 | 418 | ||
419 | #define ACPI_STATE_COMMON /* Two 32-bit fields and a pointer */\ | 419 | #define ACPI_STATE_COMMON /* Two 32-bit fields and a pointer */\ |
420 | u8 data_type; /* To differentiate various internal objs */\ | 420 | u8 data_type; /* To differentiate various internal objs */\ |
421 | u8 flags; \ | 421 | u8 flags; \ |
422 | u16 value; \ | 422 | u16 value; \ |
423 | u16 state; \ | 423 | u16 state; \ |
424 | u16 reserved; \ | 424 | u16 reserved; \ |
425 | void *next; \ | 425 | void *next; |
426 | 426 | ||
427 | struct acpi_common_state { | 427 | struct acpi_common_state { |
428 | ACPI_STATE_COMMON}; | 428 | ACPI_STATE_COMMON}; |
@@ -575,8 +575,7 @@ union acpi_parse_value { | |||
575 | char aml_op_name[16]) /* Op name (debug only) */\ | 575 | char aml_op_name[16]) /* Op name (debug only) */\ |
576 | /* NON-DEBUG members below: */\ | 576 | /* NON-DEBUG members below: */\ |
577 | struct acpi_namespace_node *node; /* For use by interpreter */\ | 577 | struct acpi_namespace_node *node; /* For use by interpreter */\ |
578 | union acpi_parse_value value; /* Value or args associated with the opcode */\ | 578 | union acpi_parse_value value; /* Value or args associated with the opcode */ |
579 | |||
580 | 579 | ||
581 | #define ACPI_DASM_BUFFER 0x00 | 580 | #define ACPI_DASM_BUFFER 0x00 |
582 | #define ACPI_DASM_RESOURCE 0x01 | 581 | #define ACPI_DASM_RESOURCE 0x01 |