From: Dominik Brodowski Date: Thu, 14 May 2015 13:31:25 +0000 (+0200) Subject: ACPI / osl: use same type for acpi_predefined_names values as in definition X-Git-Tag: v4.2-rc1~150^2~14^4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bad7e27e02ce0984c17e4074c63e7691291244f;p=thirdparty%2Fkernel%2Flinux.git ACPI / osl: use same type for acpi_predefined_names values as in definition In the definition of struct acpi_predefined_names, value is of type char *. Make the OSL override function also work with type char * (or, more precisely, with a pointer to it). Signed-off-by: Dominik Brodowski Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 39748bb3a5430..7a327b24df954 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -543,7 +543,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; acpi_status acpi_os_predefined_override(const struct acpi_predefined_names *init_val, - acpi_string * new_val) + char **new_val) { if (!init_val || !new_val) return AE_BAD_PARAMETER; diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 0bc78df66d4b1..d02df0a49d980 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -95,7 +95,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, - acpi_string * new_val); + char **new_val); #endif #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override