From: Lv Zheng <lv.zheng@intel.com>
Date: Wed, 31 Oct 2012 02:25:24 +0000 (+0000)
Subject: ACPICA: Fix divergences of definition conflicts.
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~88^2~14^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78e25fef2751434f38c7f711ecbf8762f79f7318;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed