diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /include/acpi/acstruct.h | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'include/acpi/acstruct.h')
| -rw-r--r-- | include/acpi/acstruct.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h index 5e8095f0f78f..aeb4498e5e06 100644 --- a/include/acpi/acstruct.h +++ b/include/acpi/acstruct.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (C) 2000 - 2006, R. Byron Moore | 8 | * Copyright (C) 2000 - 2007, R. Byron Moore |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * | 10 | * |
| 11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
| @@ -139,7 +139,8 @@ struct acpi_init_walk_info { | |||
| 139 | u16 buffer_init; | 139 | u16 buffer_init; |
| 140 | u16 package_init; | 140 | u16 package_init; |
| 141 | u16 object_count; | 141 | u16 object_count; |
| 142 | struct acpi_table_desc *table_desc; | 142 | acpi_owner_id owner_id; |
| 143 | acpi_native_uint table_index; | ||
| 143 | }; | 144 | }; |
| 144 | 145 | ||
| 145 | struct acpi_get_devices_info { | 146 | struct acpi_get_devices_info { |