diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
| commit | 71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea (patch) | |
| tree | af25c06aa1af3ff2c210fe4b39abfdda55b84349 /drivers/acpi/dispatcher/dsutils.c | |
| parent | 3dd6786f55219f87fd33e153669600d715ca9270 (diff) | |
| parent | fd3509436fde38d4c854bf5a6b83d2c779904f8e (diff) | |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/dispatcher/dsutils.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsutils.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c index e4073e05a75c..71503c036f7c 100644 --- a/drivers/acpi/dispatcher/dsutils.c +++ b/drivers/acpi/dispatcher/dsutils.c | |||
| @@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, | |||
| 556 | * indicate this to the interpreter, set the | 556 | * indicate this to the interpreter, set the |
| 557 | * object to the root | 557 | * object to the root |
| 558 | */ | 558 | */ |
| 559 | obj_desc = | 559 | obj_desc = ACPI_CAST_PTR(union |
| 560 | ACPI_CAST_PTR(union | 560 | acpi_operand_object, |
| 561 | acpi_operand_object, | 561 | acpi_gbl_root_node); |
| 562 | acpi_gbl_root_node); | ||
| 563 | status = AE_OK; | 562 | status = AE_OK; |
| 564 | } else { | 563 | } else { |
| 565 | /* | 564 | /* |