xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPICA: Fix divergences of definition conflicts.

Browse Source 
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>
This commit is contained in:
Lv Zheng
2012-10-31 02:25:24 +00:00
committed by Rafael J. Wysocki
parent f540fadf29
commit 78e25fef27
7 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/scan.c
View File

@@ -1185,7 +1185,7 @@ static void acpi_device_set_id(struct acpi_device *device)
{
acpi_status status;
struct acpi_device_info *info;
struct acpica_device_id_list *cid_list;
struct acpi_pnp_device_id_list *cid_list;
int i;
switch (device->device_type) {