diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 23:41:06 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 23:41:06 (GMT) |
| commit | d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a (patch) | |
| tree | 40a9215d60f1bd11ba246d1884abb1e7533327e5 /drivers/acpi/acpica/nsobject.c | |
| parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
| parent | 878a872ead5d178b1947b480990de186529ff0b9 (diff) | |
| download | linux-d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a.tar.xz | |
Merge back new ACPICA material for v4.7.
Diffstat (limited to 'drivers/acpi/acpica/nsobject.c')
| -rw-r--r-- | drivers/acpi/acpica/nsobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c index 051306f..cfa2bb7 100644 --- a/drivers/acpi/acpica/nsobject.c +++ b/drivers/acpi/acpica/nsobject.c @@ -399,7 +399,7 @@ acpi_ns_attach_data(struct acpi_namespace_node *node, ******************************************************************************/ acpi_status -acpi_ns_detach_data(struct acpi_namespace_node * node, +acpi_ns_detach_data(struct acpi_namespace_node *node, acpi_object_handler handler) { union acpi_operand_object *obj_desc; @@ -444,7 +444,7 @@ acpi_ns_detach_data(struct acpi_namespace_node * node, ******************************************************************************/ acpi_status -acpi_ns_get_attached_data(struct acpi_namespace_node * node, +acpi_ns_get_attached_data(struct acpi_namespace_node *node, acpi_object_handler handler, void **data) { union acpi_operand_object *obj_desc; |