diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2016-03-24 09:38:28 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-04 17:16:07 +0200 |
| commit | 80b28810cc98aadc80e7ce8cc155a774a7ada8ca (patch) | |
| tree | 28b00fe7ae9865d750d36a27501d4bbec7d76c06 /include | |
| parent | 9735a22799b9214d17d3c231fe377fc852f042e9 (diff) | |
| download | linux-80b28810cc98aadc80e7ce8cc155a774a7ada8ca.tar.bz2 | |
ACPICA: Linuxize: reduce divergences for 20160212 release
The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20160212 release can be
applied with reduced human intervention.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[ rjw: White space damage fixes ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index d1e34d1eeea6..6026308f5b26 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -96,7 +96,7 @@ acpi_physical_address acpi_os_get_root_pointer(void); #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override acpi_status acpi_os_predefined_override(const struct acpi_predefined_names *init_val, - char **new_val); + acpi_string *new_val); #endif #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override |