diff options
author | Lv Zheng <lv.zheng@intel.com> | 2012-10-31 06:25:24 +0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 03:31:22 +0400 |
commit | 78e25fef2751434f38c7f711ecbf8762f79f7318 (patch) | |
tree | 7e449ecb6baaf24fe0460541df13e0d50f3da5a7 /drivers/acpi/acpica/dsutils.c | |
parent | f540fadf29a6987efbfa7daf10976935fd59ae7c (diff) | |
download | linux-78e25fef2751434f38c7f711ecbf8762f79f7318.tar.xz |
ACPICA: Fix divergences of definition conflicts.
There are conflicts in the "acpi_device_id*" definitions between the
Linux and the ACPICA. The definitions of acpi_device_id* in ACPICA
have been changed to the "acpi_pnp_device_id*". This patch changes
the corresponding "acpica_device_id*" definitiions in the Linux.
This patch will not affect the generated vmlinx binary.
This will decrease 298 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/dsutils.c')
0 files changed, 0 insertions, 0 deletions