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/exresolv.c | |
| parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
| parent | 878a872ead5d178b1947b480990de186529ff0b9 (diff) | |
| download | blackbird-op-linux-d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a.tar.gz blackbird-op-linux-d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a.zip | |
Merge back new ACPICA material for v4.7.
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 fedacf13dc36..e1d3878be2c6 100644 --- a/drivers/acpi/acpica/exresolv.c +++ b/drivers/acpi/acpica/exresolv.c @@ -334,7 +334,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, acpi_status acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state, union acpi_operand_object *operand, - acpi_object_type * return_type, + acpi_object_type *return_type, union acpi_operand_object **return_desc) { union acpi_operand_object *obj_desc = ACPI_CAST_PTR(void, operand); |
