diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
| commit | bcb631f31839cb7c7dd56ab534b6eb4867e9161b (patch) | |
| tree | d86336c9cfb22e4af69fbe73c94299a775ecc220 /drivers/acpi/dispatcher/dsopcode.c | |
| parent | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (diff) | |
| parent | ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 (diff) | |
Merge branch 'acpica' into test
Diffstat (limited to 'drivers/acpi/dispatcher/dsopcode.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsopcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c index 6a81c4400edf..69fae5905bb8 100644 --- a/drivers/acpi/dispatcher/dsopcode.c +++ b/drivers/acpi/dispatcher/dsopcode.c | |||
| @@ -1330,7 +1330,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state, | |||
| 1330 | (walk_state->results->results.obj_desc[0]) == | 1330 | (walk_state->results->results.obj_desc[0]) == |
| 1331 | ACPI_TYPE_LOCAL_REFERENCE) | 1331 | ACPI_TYPE_LOCAL_REFERENCE) |
| 1332 | && ((walk_state->results->results.obj_desc[0])-> | 1332 | && ((walk_state->results->results.obj_desc[0])-> |
| 1333 | reference.opcode != AML_INDEX_OP)) { | 1333 | reference.class != ACPI_REFCLASS_INDEX)) { |
| 1334 | status = | 1334 | status = |
| 1335 | acpi_ex_resolve_to_value(&walk_state-> | 1335 | acpi_ex_resolve_to_value(&walk_state-> |
| 1336 | results->results. | 1336 | results->results. |