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/osl.c | |
| parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
| parent | 878a872ead5d178b1947b480990de186529ff0b9 (diff) | |
Merge back new ACPICA material for v4.7.
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 814d5f83b75e..bef06c9503cd 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -582,7 +582,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; acpi_status acpi_os_predefined_override(const struct acpi_predefined_names *init_val, - char **new_val) + acpi_string *new_val) { if (!init_val || !new_val) return AE_BAD_PARAMETER; |