diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 04:14:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 04:14:56 -0400 |
| commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
| tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /drivers/acpi/executer/exprep.c | |
| parent | 1b82c9666a6f637ccb3a86d0fbe23d0427076815 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/step
Diffstat (limited to 'drivers/acpi/executer/exprep.c')
| -rw-r--r-- | drivers/acpi/executer/exprep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c index 3a2f8cd4c62a..5d438c32989d 100644 --- a/drivers/acpi/executer/exprep.c +++ b/drivers/acpi/executer/exprep.c | |||
| @@ -503,11 +503,11 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) | |||
| 503 | */ | 503 | */ |
| 504 | second_desc = obj_desc->common.next_object; | 504 | second_desc = obj_desc->common.next_object; |
| 505 | second_desc->extra.aml_start = | 505 | second_desc->extra.aml_start = |
| 506 | ((union acpi_parse_object *)(info->data_register_node))-> | 506 | ACPI_CAST_PTR(union acpi_parse_object, |
| 507 | named.data; | 507 | info->data_register_node)->named.data; |
| 508 | second_desc->extra.aml_length = | 508 | second_desc->extra.aml_length = |
| 509 | ((union acpi_parse_object *)(info->data_register_node))-> | 509 | ACPI_CAST_PTR(union acpi_parse_object, |
| 510 | named.length; | 510 | info->data_register_node)->named.length; |
| 511 | 511 | ||
| 512 | break; | 512 | break; |
| 513 | 513 | ||