diff options
Diffstat (limited to 'drivers/acpi/acpica/acstruct.h')
-rw-r--r-- | drivers/acpi/acpica/acstruct.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h index 161bc0e3d70a..6e5dd97949fe 100644 --- a/drivers/acpi/acpica/acstruct.h +++ b/drivers/acpi/acpica/acstruct.h | |||
@@ -127,22 +127,22 @@ struct acpi_walk_state { | |||
127 | acpi_parse_upwards ascending_callback; | 127 | acpi_parse_upwards ascending_callback; |
128 | }; | 128 | }; |
129 | 129 | ||
130 | /* Info used by acpi_ps_init_objects */ | 130 | /* Info used by acpi_ns_initialize_objects and acpi_ds_initialize_objects */ |
131 | 131 | ||
132 | struct acpi_init_walk_info { | 132 | struct acpi_init_walk_info { |
133 | u16 method_count; | ||
134 | u16 device_count; | ||
135 | u16 op_region_count; | ||
136 | u16 field_count; | ||
137 | u16 buffer_count; | ||
138 | u16 package_count; | ||
139 | u16 op_region_init; | ||
140 | u16 field_init; | ||
141 | u16 buffer_init; | ||
142 | u16 package_init; | ||
143 | u16 object_count; | ||
144 | acpi_owner_id owner_id; | ||
145 | u32 table_index; | 133 | u32 table_index; |
134 | u32 object_count; | ||
135 | u32 method_count; | ||
136 | u32 device_count; | ||
137 | u32 op_region_count; | ||
138 | u32 field_count; | ||
139 | u32 buffer_count; | ||
140 | u32 package_count; | ||
141 | u32 op_region_init; | ||
142 | u32 field_init; | ||
143 | u32 buffer_init; | ||
144 | u32 package_init; | ||
145 | acpi_owner_id owner_id; | ||
146 | }; | 146 | }; |
147 | 147 | ||
148 | struct acpi_get_devices_info { | 148 | struct acpi_get_devices_info { |
@@ -201,11 +201,11 @@ struct acpi_evaluate_info { | |||
201 | /* Info used by acpi_ns_initialize_devices */ | 201 | /* Info used by acpi_ns_initialize_devices */ |
202 | 202 | ||
203 | struct acpi_device_walk_info { | 203 | struct acpi_device_walk_info { |
204 | u16 device_count; | ||
205 | u16 num_STA; | ||
206 | u16 num_INI; | ||
207 | struct acpi_table_desc *table_desc; | 204 | struct acpi_table_desc *table_desc; |
208 | struct acpi_evaluate_info *evaluate_info; | 205 | struct acpi_evaluate_info *evaluate_info; |
206 | u32 device_count; | ||
207 | u32 num_STA; | ||
208 | u32 num_INI; | ||
209 | }; | 209 | }; |
210 | 210 | ||
211 | /* TBD: [Restructure] Merge with struct above */ | 211 | /* TBD: [Restructure] Merge with struct above */ |