summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/acutils.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2012-10-31 02:25:24 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-15 00:31:22 +0100
commit78e25fef2751434f38c7f711ecbf8762f79f7318 (patch)
tree7e449ecb6baaf24fe0460541df13e0d50f3da5a7 /drivers/acpi/acpica/acutils.h
parentf540fadf29a6987efbfa7daf10976935fd59ae7c (diff)
downloadlinux-78e25fef2751434f38c7f711ecbf8762f79f7318.tar.bz2
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/acutils.h')
-rw-r--r--drivers/acpi/acpica/acutils.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 82d6025332e9..d94b41776575 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -355,15 +355,15 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
*/
acpi_status
acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
- struct acpica_device_id ** return_id);
+ struct acpi_pnp_device_id ** return_id);
acpi_status
acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
- struct acpica_device_id ** return_id);
+ struct acpi_pnp_device_id ** return_id);
acpi_status
acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
- struct acpica_device_id_list ** return_cid_list);
+ struct acpi_pnp_device_id_list ** return_cid_list);
/*
* utlock - reader/writer locks