aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-07 17:14:25 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-07 17:14:25 -0500
commit583bdc59820692eead7868e816d08bee4c55c1c6 (patch)
treed9aaa6d76f171aa3f92ec6ae01f0caa29710c623 /drivers/acpi/scan.c
parent8ab788f00263e886a5ac74b51ee0a226e4363795 (diff)
parent5e7779f0395833d80d8fa15933737c8dc48759ec (diff)
Merge branch 'acpi-enumeration'
* acpi-enumeration: ACPI: add Haswell LPSS devices to acpi_platform_device_ids list ACPI: add documentation about ACPI 5 enumeration
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 67a7fa638f7f..8ee379ef309a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -37,6 +37,16 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
37 37
38 { "PNP0D40" }, 38 { "PNP0D40" },
39 39
40 /* Haswell LPSS devices */
41 { "INT33C0", 0 },
42 { "INT33C1", 0 },
43 { "INT33C2", 0 },
44 { "INT33C3", 0 },
45 { "INT33C4", 0 },
46 { "INT33C5", 0 },
47 { "INT33C6", 0 },
48 { "INT33C7", 0 },
49
40 { } 50 { }
41}; 51};
42 52