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/dsopcode.c | |
| parent | 3dd6786f55219f87fd33e153669600d715ca9270 (diff) | |
| parent | fd3509436fde38d4c854bf5a6b83d2c779904f8e (diff) | |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/dispatcher/dsopcode.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsopcode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c index 6c6104a7a247..fc9da4879cbf 100644 --- a/drivers/acpi/dispatcher/dsopcode.c +++ b/drivers/acpi/dispatcher/dsopcode.c | |||
| @@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state, | |||
| 866 | ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) && | 866 | ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) && |
| 867 | (op->common.parent->common.aml_opcode != | 867 | (op->common.parent->common.aml_opcode != |
| 868 | AML_VAR_PACKAGE_OP) | 868 | AML_VAR_PACKAGE_OP) |
| 869 | && (op->common.parent->common.aml_opcode != | 869 | && (op->common.parent->common.aml_opcode != AML_NAME_OP))) { |
| 870 | AML_NAME_OP))) { | ||
| 871 | walk_state->result_obj = obj_desc; | 870 | walk_state->result_obj = obj_desc; |
| 872 | } | 871 | } |
| 873 | } | 872 | } |