diff options
Diffstat (limited to 'include/acpi/acstruct.h')
| -rw-r--r-- | include/acpi/acstruct.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h index a2025a8da008..f375c17ad0b6 100644 --- a/include/acpi/acstruct.h +++ b/include/acpi/acstruct.h | |||
| @@ -71,7 +71,6 @@ struct acpi_walk_state | |||
| 71 | u8 walk_type; | 71 | u8 walk_type; |
| 72 | acpi_owner_id owner_id; /* Owner of objects created during the walk */ | 72 | acpi_owner_id owner_id; /* Owner of objects created during the walk */ |
| 73 | u8 last_predicate; /* Result of last predicate */ | 73 | u8 last_predicate; /* Result of last predicate */ |
| 74 | u8 reserved; /* For alignment */ | ||
| 75 | u8 current_result; /* */ | 74 | u8 current_result; /* */ |
| 76 | u8 next_op_info; /* Info about next_op */ | 75 | u8 next_op_info; /* Info about next_op */ |
| 77 | u8 num_operands; /* Stack pointer for Operands[] array */ | 76 | u8 num_operands; /* Stack pointer for Operands[] array */ |
| @@ -154,17 +153,17 @@ struct acpi_device_walk_info | |||
| 154 | struct acpi_walk_info | 153 | struct acpi_walk_info |
| 155 | { | 154 | { |
| 156 | u32 debug_level; | 155 | u32 debug_level; |
| 157 | u32 owner_id; | 156 | acpi_owner_id owner_id; |
| 158 | u8 display_type; | 157 | u8 display_type; |
| 159 | }; | 158 | }; |
| 160 | 159 | ||
| 161 | /* Display Types */ | 160 | /* Display Types */ |
| 162 | 161 | ||
| 163 | #define ACPI_DISPLAY_SUMMARY 0 | 162 | #define ACPI_DISPLAY_SUMMARY (u8) 0 |
| 164 | #define ACPI_DISPLAY_OBJECTS 1 | 163 | #define ACPI_DISPLAY_OBJECTS (u8) 1 |
| 165 | #define ACPI_DISPLAY_MASK 1 | 164 | #define ACPI_DISPLAY_MASK (u8) 1 |
| 166 | 165 | ||
| 167 | #define ACPI_DISPLAY_SHORT 2 | 166 | #define ACPI_DISPLAY_SHORT (u8) 2 |
| 168 | 167 | ||
| 169 | struct acpi_get_devices_info | 168 | struct acpi_get_devices_info |
| 170 | { | 169 | { |