summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpi_platform.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-16 19:04:41 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-16 19:04:41 +0400
commitc0ad8568c81979be9c115d22ff1c3580f5ecd0bb (patch)
treeda78df8d5120d3eefd1d5ede2f75db8758969035 /drivers/acpi/acpi_platform.c
parente83dda06242073b1c7f9a88f1001e32a4b9fcd1d (diff)
parentab0fd674d6cef0904baa511f22613ef6474f8169 (diff)
downloadlinux-c0ad8568c81979be9c115d22ff1c3580f5ecd0bb.tar.xz
Merge branch 'acpi-conversion' into acpi-assorted
The following commits depend on the 'acpi-conversion' material. Conflicts: drivers/acpi/acpi_platform.c
Diffstat (limited to 'drivers/acpi/acpi_platform.c')
-rw-r--r--drivers/acpi/acpi_platform.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index ed0f06390245..aef79db906fe 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -29,10 +29,13 @@ ACPI_MODULE_NAME("platform");
static const struct acpi_device_id acpi_platform_device_ids[] = {
{ "PNP0D40" },
+ { "ACPI0003" },
+ { "VPC2004" },
/* Intel Smart Sound Technology */
{ "INT33C8" },
{ "80860F28" },
+
{ }
};