commit 78e25fef2751434f38c7f711ecbf8762f79f7318
author Lv Zheng <lv.zheng@intel.com> Wed Oct 31 02:25:24 2012 +0000
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Nov 15 00:31:22 2012 +0100
tree 7e449ecb6baaf24fe0460541df13e0d50f3da5a7
parent f540fadf29a6987efbfa7daf10976935fd59ae7c

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>