diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-16 14:45:13 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-16 14:45:13 (GMT) |
commit | f86e7bc9683ee6dbde56d4bd4fda65f085b814d0 (patch) | |
tree | 57b02c4d1b8c81023787cadbf1df0db1bba0e6b3 /drivers/acpi | |
parent | eb64821243cd6f72646b3ffb9ee2245f83256b32 (diff) | |
parent | a4d97536a1a20a70a65ded5d445013a3904d5a8d (diff) | |
download | linux-f86e7bc9683ee6dbde56d4bd4fda65f085b814d0.tar.xz |
Merge branch 'acpi-lpss'
* acpi-lpss:
ACPI / LPSS: add ACPI IDs for newer Intel PCHs
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpi_lpss.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index d396101..6745fe1 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -163,6 +163,15 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { { "80860F41", (unsigned long)&byt_i2c_dev_desc }, { "INT33B2", }, + { "INT3430", (unsigned long)&lpt_dev_desc }, + { "INT3431", (unsigned long)&lpt_dev_desc }, + { "INT3432", (unsigned long)&lpt_dev_desc }, + { "INT3433", (unsigned long)&lpt_dev_desc }, + { "INT3434", (unsigned long)&lpt_uart_dev_desc }, + { "INT3435", (unsigned long)&lpt_uart_dev_desc }, + { "INT3436", (unsigned long)&lpt_sdio_dev_desc }, + { "INT3437", }, + { } }; |