diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 01:41:06 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 01:41:06 +0200 |
commit | d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a (patch) | |
tree | 40a9215d60f1bd11ba246d1884abb1e7533327e5 /drivers/acpi/acpica/dsmethod.c | |
parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
parent | 878a872ead5d178b1947b480990de186529ff0b9 (diff) |
Merge back new ACPICA material for v4.7.
Diffstat (limited to 'drivers/acpi/acpica/dsmethod.c')
-rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index da198b864107..47c7b52a519c 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -209,7 +209,7 @@ acpi_ds_detect_named_opcodes(struct acpi_walk_state *walk_state, ******************************************************************************/ acpi_status -acpi_ds_method_error(acpi_status status, struct acpi_walk_state * walk_state) +acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state) { u32 aml_offset; |