diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 01:03:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 01:03:27 +0100 |
| commit | 2d304ba757eb79f58451538497b4f556555e3eb7 (patch) | |
| tree | 6deb6799a3a3743047045324ad5218936b9f35b4 /drivers/acpi/acpica/acresrc.h | |
| parent | 434a438af20865cd41ab08c07281b72637460e41 (diff) | |
| parent | 91be0998578a1001db1382012676ee0a69d5cee3 (diff) | |
Merge branch 'acpica'
* acpica:
ACPI: Clean up incorrect inclusions of ACPICA headers
ACPICA: Update version to 20131115.
ACPICA: Add support to delete all objects attached to the root namespace node.
ACPICA: Delete all attached data objects during namespace node deletion.
ACPICA: Resources: Fix loop termination for the get AML length function.
ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
ACPICA: Debug output: Do not emit function nesting level for kernel build.
Diffstat (limited to 'drivers/acpi/acpica/acresrc.h')
| -rw-r--r-- | drivers/acpi/acpica/acresrc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h index f691d0e4d9f..ff97430455c 100644 --- a/drivers/acpi/acpica/acresrc.h +++ b/drivers/acpi/acpica/acresrc.h @@ -184,7 +184,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer, struct acpi_buffer *output_buffer); acpi_status -acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer, +acpi_rs_create_aml_resources(struct acpi_buffer *resource_list, struct acpi_buffer *output_buffer); acpi_status @@ -227,8 +227,8 @@ acpi_rs_get_list_length(u8 * aml_buffer, u32 aml_buffer_length, acpi_size * size_needed); acpi_status -acpi_rs_get_aml_length(struct acpi_resource *linked_list_buffer, - acpi_size * size_needed); +acpi_rs_get_aml_length(struct acpi_resource *resource_list, + acpi_size resource_list_size, acpi_size * size_needed); acpi_status acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, |