diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-08 02:14:25 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-08 02:14:25 +0400 |
| commit | 583bdc59820692eead7868e816d08bee4c55c1c6 (patch) | |
| tree | d9aaa6d76f171aa3f92ec6ae01f0caa29710c623 /drivers/acpi | |
| parent | 8ab788f00263e886a5ac74b51ee0a226e4363795 (diff) | |
| parent | 5e7779f0395833d80d8fa15933737c8dc48759ec (diff) | |
| download | linux-583bdc59820692eead7868e816d08bee4c55c1c6.tar.xz | |
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')
| -rw-r--r-- | drivers/acpi/scan.c | 10 |
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[] = { { "PNP0D40" }, + /* Haswell LPSS devices */ + { "INT33C0", 0 }, + { "INT33C1", 0 }, + { "INT33C2", 0 }, + { "INT33C3", 0 }, + { "INT33C4", 0 }, + { "INT33C5", 0 }, + { "INT33C6", 0 }, + { "INT33C7", 0 }, + { } }; |