diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2012-10-31 03:25:36 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:31:23 +0100 |
| commit | 644ef74e6d187ca2e8a23ff41a513964de36f93e (patch) | |
| tree | e9dff693037687f98ef7027f2f65f0f79fe5ac15 /drivers/acpi/acpica/acobject.h | |
| parent | ACPICA: Fix divergences of definition conflicts. (diff) | |
| download | linux-644ef74e6d187ca2e8a23ff41a513964de36f93e.tar.xz linux-644ef74e6d187ca2e8a23ff41a513964de36f93e.zip | |
ACPICA: Fix AcpiSrc caused divergences.
There are definitions that can been converted into new styles by
the recent AcpiSrc while they remain the old styles in the Linux.
This patch fixes those definitions that will be converted by the
AcpiSrc.
This patch will not affect the generated vmlinux binary.
This will decrease 97 lines of 20120913 divergence.diff.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/acobject.h')
| -rw-r--r-- | drivers/acpi/acpica/acobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h index 364a1303fb8f..ac4269fb1a37 100644 --- a/drivers/acpi/acpica/acobject.h +++ b/drivers/acpi/acpica/acobject.h @@ -179,7 +179,7 @@ struct acpi_object_method { union acpi_operand_object *mutex; u8 *aml_start; union { - ACPI_INTERNAL_METHOD implementation; + acpi_internal_method implementation; union acpi_operand_object *handler; } dispatch; |