Signed-off-by: Thomas Renninger <trenn@xxxxxxx> --- drivers/acpi/utils.c | 11 +++++------ include/acpi/acpi_bus.h | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 1009261..250d7f1 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -295,15 +295,14 @@ acpi_evaluate_integer(acpi_handle handle, EXPORT_SYMBOL(acpi_evaluate_integer); -#if 0 acpi_status acpi_evaluate_string(acpi_handle handle, acpi_string pathname, - acpi_object_list * arguments, acpi_string * data) + struct acpi_object_list *arguments, acpi_string *data) { acpi_status status = AE_OK; - acpi_object *element = NULL; - acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *element = NULL; + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; if (!data) @@ -315,7 +314,7 @@ acpi_evaluate_string(acpi_handle handle, return status; } - element = (acpi_object *) buffer.pointer; + element = (union acpi_object *) buffer.pointer; if ((element->type != ACPI_TYPE_STRING) || (element->type != ACPI_TYPE_BUFFER) @@ -338,7 +337,7 @@ acpi_evaluate_string(acpi_handle handle, return AE_OK; } -#endif +EXPORT_SYMBOL(acpi_evaluate_string); acpi_status acpi_evaluate_reference(acpi_handle handle, diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a5ac0bc..08a191f 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -48,6 +48,10 @@ acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments, unsigned long *data); acpi_status +acpi_evaluate_string(acpi_handle handle, + acpi_string pathname, + struct acpi_object_list *arguments, acpi_string *data); +acpi_status acpi_evaluate_reference(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments, -- 1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html