Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / acpi / scan.c

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index daee7497efd30137f2dddef2497f9968555d4e26..4be408756adc1df4e15eee0d237f06bfe3e5070e 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1783,6 +1783,7 @@ int __init acpi_scan_init(void)
        acpi_platform_init();
        acpi_csrt_init();
        acpi_container_init();
+       acpi_pci_slot_init();
 
        mutex_lock(&acpi_scan_lock);
        /*
@@ -1804,6 +1805,8 @@ int __init acpi_scan_init(void)
 
        acpi_update_all_gpes();
 
+       acpi_pci_root_hp_init();
+
  out:
        mutex_unlock(&acpi_scan_lock);
        return result;