diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-09 23:22:36 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-09 23:22:36 +0200 |
commit | 8269c734049cf4869c99d63c5d94774db37ca190 (patch) | |
tree | 3747a5972d72604e664ff40322fb5e8b6dd935f0 /drivers/acpi/acpica/dswload2.c | |
parent | Merge tag 'acpi-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
parent | ACPICA: Update version to 20170303 (diff) | |
download | linux-8269c734049cf4869c99d63c5d94774db37ca190.tar.xz linux-8269c734049cf4869c99d63c5d94774db37ca190.zip |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20170303
ACPICA: iasl: add ASL conversion tool
ACPICA: Local cache support: Allow small cache objects
ACPICA: Disassembler: Do not unconditionally remove temporary names
ACPICA: iasl: Fix IORT SMMU GSI disassembling
ACPICA: Cleanup AML opcode definitions, no functional change
ACPICA: Debugger: Add interpreter blocking mark for single-step mode
ACPICA: debugger: fix memory leak on Pathname
ACPICA: Update for automatic repair code for objects returned by evaluate_object
ACPICA: Namespace: fix operand cache leak
ACPICA: Fix several incorrect invocations of ACPICA return macro
ACPICA: Fix a module for excessive debug output
ACPICA: Update some function headers, no funtional change
ACPICA: Disassembler: Enhance resource descriptor detection
ACPICA: Add non-linux host build support
Diffstat (limited to 'drivers/acpi/acpica/dswload2.c')
-rw-r--r-- | drivers/acpi/acpica/dswload2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c index 44d4553dfbdd..8d510c7e20c8 100644 --- a/drivers/acpi/acpica/dswload2.c +++ b/drivers/acpi/acpica/dswload2.c @@ -528,7 +528,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) status = acpi_ex_create_processor(walk_state); break; - case AML_POWER_RES_OP: + case AML_POWER_RESOURCE_OP: status = acpi_ex_create_power_resource(walk_state); break; |