diff options
| author | Rafael J. Wysocki | 2012-12-07 23:14:25 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2012-12-07 23:14:25 +0100 |
| commit | 583bdc59820692eead7868e816d08bee4c55c1c6 (patch) | |
| tree | d9aaa6d76f171aa3f92ec6ae01f0caa29710c623 /drivers/acpi/scan.c | |
| parent | Merge branch 'acpi-dev-pm' (diff) | |
| parent | ACPI: add Haswell LPSS devices to acpi_platform_device_ids list (diff) | |
| download | kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.tar.gz kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.tar.xz kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.zip | |
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.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 }, + { } }; |