diff options
Diffstat (limited to 'include/acpi/aclocal.h')
-rw-r--r-- | include/acpi/aclocal.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index 01d3b4bc0c85..030e641115cb 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h | |||
@@ -72,7 +72,6 @@ typedef u32 acpi_mutex_handle; | |||
72 | * | 72 | * |
73 | * NOTE: any changes here must be reflected in the acpi_gbl_mutex_names table also! | 73 | * NOTE: any changes here must be reflected in the acpi_gbl_mutex_names table also! |
74 | */ | 74 | */ |
75 | |||
76 | #define ACPI_MTX_EXECUTE 0 | 75 | #define ACPI_MTX_EXECUTE 0 |
77 | #define ACPI_MTX_INTERPRETER 1 | 76 | #define ACPI_MTX_INTERPRETER 1 |
78 | #define ACPI_MTX_PARSER 2 | 77 | #define ACPI_MTX_PARSER 2 |
@@ -151,13 +150,13 @@ typedef u16 acpi_owner_id; | |||
151 | #define ACPI_FIELD_DWORD_GRANULARITY 4 | 150 | #define ACPI_FIELD_DWORD_GRANULARITY 4 |
152 | #define ACPI_FIELD_QWORD_GRANULARITY 8 | 151 | #define ACPI_FIELD_QWORD_GRANULARITY 8 |
153 | 152 | ||
153 | |||
154 | /***************************************************************************** | 154 | /***************************************************************************** |
155 | * | 155 | * |
156 | * Namespace typedefs and structs | 156 | * Namespace typedefs and structs |
157 | * | 157 | * |
158 | ****************************************************************************/ | 158 | ****************************************************************************/ |
159 | 159 | ||
160 | |||
161 | /* Operational modes of the AML interpreter/scanner */ | 160 | /* Operational modes of the AML interpreter/scanner */ |
162 | 161 | ||
163 | typedef enum | 162 | typedef enum |
@@ -176,7 +175,6 @@ typedef enum | |||
176 | * data_type is used to differentiate between internal descriptors, and MUST | 175 | * data_type is used to differentiate between internal descriptors, and MUST |
177 | * be the first byte in this structure. | 176 | * be the first byte in this structure. |
178 | */ | 177 | */ |
179 | |||
180 | union acpi_name_union | 178 | union acpi_name_union |
181 | { | 179 | { |
182 | u32 integer; | 180 | u32 integer; |
@@ -415,7 +413,6 @@ struct acpi_field_info | |||
415 | * | 413 | * |
416 | ****************************************************************************/ | 414 | ****************************************************************************/ |
417 | 415 | ||
418 | |||
419 | #define ACPI_CONTROL_NORMAL 0xC0 | 416 | #define ACPI_CONTROL_NORMAL 0xC0 |
420 | #define ACPI_CONTROL_CONDITIONAL_EXECUTING 0xC1 | 417 | #define ACPI_CONTROL_CONDITIONAL_EXECUTING 0xC1 |
421 | #define ACPI_CONTROL_PREDICATE_EXECUTING 0xC2 | 418 | #define ACPI_CONTROL_PREDICATE_EXECUTING 0xC2 |
@@ -424,6 +421,7 @@ struct acpi_field_info | |||
424 | 421 | ||
425 | 422 | ||
426 | /* Forward declarations */ | 423 | /* Forward declarations */ |
424 | |||
427 | struct acpi_walk_state ; | 425 | struct acpi_walk_state ; |
428 | struct acpi_obj_mutex; | 426 | struct acpi_obj_mutex; |
429 | union acpi_parse_object ; | 427 | union acpi_parse_object ; |
@@ -601,7 +599,6 @@ struct acpi_opcode_info | |||
601 | u8 type; /* Opcode type */ | 599 | u8 type; /* Opcode type */ |
602 | }; | 600 | }; |
603 | 601 | ||
604 | |||
605 | union acpi_parse_value | 602 | union acpi_parse_value |
606 | { | 603 | { |
607 | acpi_integer integer; /* Integer constant (Up to 64 bits) */ | 604 | acpi_integer integer; /* Integer constant (Up to 64 bits) */ |
@@ -613,7 +610,6 @@ union acpi_parse_value | |||
613 | union acpi_parse_object *arg; /* arguments and contained ops */ | 610 | union acpi_parse_object *arg; /* arguments and contained ops */ |
614 | }; | 611 | }; |
615 | 612 | ||
616 | |||
617 | #define ACPI_PARSE_COMMON \ | 613 | #define ACPI_PARSE_COMMON \ |
618 | u8 data_type; /* To differentiate various internal objs */\ | 614 | u8 data_type; /* To differentiate various internal objs */\ |
619 | u8 flags; /* Type of Op */\ | 615 | u8 flags; /* Type of Op */\ |
@@ -691,7 +687,6 @@ struct acpi_parse_obj_asl | |||
691 | char parse_op_name[12]; | 687 | char parse_op_name[12]; |
692 | }; | 688 | }; |
693 | 689 | ||
694 | |||
695 | union acpi_parse_object | 690 | union acpi_parse_object |
696 | { | 691 | { |
697 | struct acpi_parse_obj_common common; | 692 | struct acpi_parse_obj_common common; |
@@ -834,7 +829,6 @@ struct acpi_bit_register_info | |||
834 | * | 829 | * |
835 | ****************************************************************************/ | 830 | ****************************************************************************/ |
836 | 831 | ||
837 | |||
838 | /* resource_type values */ | 832 | /* resource_type values */ |
839 | 833 | ||
840 | #define ACPI_RESOURCE_TYPE_MEMORY_RANGE 0 | 834 | #define ACPI_RESOURCE_TYPE_MEMORY_RANGE 0 |