summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2015-05-14 16:31:25 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-14 23:16:38 +0300
commit2bad7e27e02ce0984c17e4074c63e7691291244f (patch)
tree0791e52696fc804b012515f94001df781e0a30b0 /include/acpi
parent030bbdbf4c833bc69f502eae58498bc5572db736 (diff)
downloadlinux-2bad7e27e02ce0984c17e4074c63e7691291244f.tar.xz
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>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpiosxf.h2
1 files changed, 1 insertions, 1 deletions
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