diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
| commit | c172cb73bc79fe69915b1a1a48e374aa4b1f8a59 (patch) | |
| tree | eb3d6415914968441c063f7282e824b14b5a5edb /drivers/acpi/acpica/acstruct.h | |
| parent | e8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (diff) | |
| parent | 28f4f8a9def2b1f3a6066bae791c77043ec49524 (diff) | |
Merge branch 'acpica-gpe' into release
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 { acpi_parse_upwards ascending_callback; }; -/* Info used by acpi_ps_init_objects */ +/* Info used by acpi_ns_initialize_objects and acpi_ds_initialize_objects */ struct acpi_init_walk_info { - u16 method_count; - u16 device_count; - u16 op_region_count; - u16 field_count; - u16 buffer_count; - u16 package_count; - u16 op_region_init; - u16 field_init; - u16 buffer_init; - u16 package_init; - u16 object_count; - acpi_owner_id owner_id; u32 table_index; + u32 object_count; + u32 method_count; + u32 device_count; + u32 op_region_count; + u32 field_count; + u32 buffer_count; + u32 package_count; + u32 op_region_init; + u32 field_init; + u32 buffer_init; + u32 package_init; + acpi_owner_id owner_id; }; struct acpi_get_devices_info { @@ -201,11 +201,11 @@ struct acpi_evaluate_info { /* Info used by acpi_ns_initialize_devices */ struct acpi_device_walk_info { - u16 device_count; - u16 num_STA; - u16 num_INI; struct acpi_table_desc *table_desc; struct acpi_evaluate_info *evaluate_info; + u32 device_count; + u32 num_STA; + u32 num_INI; }; /* TBD: [Restructure] Merge with struct above */ |