diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/acpi/acpica/exresolv.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/acpi/acpica/exresolv.c')
| -rw-r--r-- | drivers/acpi/acpica/exresolv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c index 3673d2b2c4ac..f6105a6d6126 100644 --- a/drivers/acpi/acpica/exresolv.c +++ b/drivers/acpi/acpica/exresolv.c | |||
| @@ -147,7 +147,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, | |||
| 147 | 147 | ||
| 148 | stack_desc = *stack_ptr; | 148 | stack_desc = *stack_ptr; |
| 149 | 149 | ||
| 150 | /* This is an union acpi_operand_object */ | 150 | /* This is a union acpi_operand_object */ |
| 151 | 151 | ||
| 152 | switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { | 152 | switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { |
| 153 | case ACPI_TYPE_LOCAL_REFERENCE: | 153 | case ACPI_TYPE_LOCAL_REFERENCE: |