Merge branch 'acpi-conversion' into acpi-assorted
The following commits depend on the 'acpi-conversion' material.
Conflicts:
drivers/acpi/acpi_platform.c
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index ed0f063..aef79db 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -29,10 +29,13 @@
static const struct acpi_device_id acpi_platform_device_ids[] = {
{ "PNP0D40" },
+ { "ACPI0003" },
+ { "VPC2004" },
/* Intel Smart Sound Technology */
{ "INT33C8" },
{ "80860F28" },
+
{ }
};