diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:53:41 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:53:41 +0200 |
| commit | 2467d7b7037438f2d1fed826fc5217dddf4b37fb (patch) | |
| tree | df18dcc4a4cc4c6cad3b79c3079a6791ceaae14a /drivers/acpi/scan.c | |
| parent | 929c6dd4195f6b4daf9887da34b3d7fbd0f2e2f5 (diff) | |
| parent | cf8df962aa830d05be1a8d5a9c7d2a67b2837b45 (diff) | |
| download | linux-2467d7b7037438f2d1fed826fc5217dddf4b37fb.tar.bz2 | |
Merge branch 'acpi-lpss'
* acpi-lpss:
ACPI / LPSS: make code less confusing for reader
ACPI / LPSS: Add support for exposing LTR registers to user space
ACPI / scan: Add special handler for Intel Lynxpoint LPSS devices
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8cacc16af6e7..d7f3c8b66fcf 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2041,6 +2041,7 @@ int __init acpi_scan_init(void) acpi_pci_root_init(); acpi_pci_link_init(); acpi_platform_init(); + acpi_lpss_init(); acpi_csrt_init(); acpi_container_init(); acpi_pci_slot_init(); |