diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2015-05-14 15:31:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:16:38 +0200 |
| commit | 2bad7e27e02ce0984c17e4074c63e7691291244f (patch) | |
| tree | 0791e52696fc804b012515f94001df781e0a30b0 | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
| download | linux-stable-2bad7e27e02ce0984c17e4074c63e7691291244f.tar.gz linux-stable-2bad7e27e02ce0984c17e4074c63e7691291244f.tar.bz2 linux-stable-2bad7e27e02ce0984c17e4074c63e7691291244f.zip | |
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 <linux@dominikbrodowski.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/osl.c | 2 | ||||
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 39748bb3a543..7a327b24df95 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 0bc78df66d4b..d02df0a49d98 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 |