diff options
-rw-r--r-- | drivers/acpi/scan.c | 4 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 19d524c5c0c8..ebbd23c94ba2 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1797,8 +1797,10 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp, | |||
1797 | return; | 1797 | return; |
1798 | } | 1798 | } |
1799 | 1799 | ||
1800 | if (info->valid & ACPI_VALID_HID) | 1800 | if (info->valid & ACPI_VALID_HID) { |
1801 | acpi_add_id(pnp, info->hardware_id.string); | 1801 | acpi_add_id(pnp, info->hardware_id.string); |
1802 | pnp->type.platform_id = 1; | ||
1803 | } | ||
1802 | if (info->valid & ACPI_VALID_CID) { | 1804 | if (info->valid & ACPI_VALID_CID) { |
1803 | cid_list = &info->compatible_id_list; | 1805 | cid_list = &info->compatible_id_list; |
1804 | for (i = 0; i < cid_list->count; i++) | 1806 | for (i = 0; i < cid_list->count; i++) |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c241c7594bbc..21477467441c 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -233,7 +233,8 @@ struct acpi_hardware_id { | |||
233 | struct acpi_pnp_type { | 233 | struct acpi_pnp_type { |
234 | u32 hardware_id:1; | 234 | u32 hardware_id:1; |
235 | u32 bus_address:1; | 235 | u32 bus_address:1; |
236 | u32 reserved:30; | 236 | u32 platform_id:1; |
237 | u32 reserved:29; | ||
237 | }; | 238 | }; |
238 | 239 | ||
239 | struct acpi_device_pnp { | 240 | struct acpi_device_pnp { |