---

yaml --- r: 350824 b: refs/heads/master c: 92ef2a2 h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · 60d029b · 60d029b
1 parent 6b49786
commit 60d029b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 805d410fb0dbd65e1a57a810858fa2491e75822d
+refs/heads/master: 92ef2a25c763338905dce8344a0584606f842920
diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
@@ -67,6 +67,7 @@ struct acpi_ec {
 
 extern struct acpi_ec *first_ec;
 
+int acpi_pci_root_init(void);
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);

diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
@@ -699,7 +699,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
-static int __init acpi_pci_root_init(void)
+int __init acpi_pci_root_init(void)
 {
 	acpi_hest_init();
 
@@ -712,5 +712,3 @@ static int __init acpi_pci_root_init(void)
 
 	return 0;
 }
-
-subsys_initcall(acpi_pci_root_init);
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
@@ -1831,6 +1831,7 @@ int __init acpi_scan_init(void)
 	}
 
 	acpi_power_init();
+	acpi_pci_root_init();
 
 	/*
 	 * Enumerate devices in the ACPI namespace.
-Original file line number
+Diff line change
@@ Expand Up / @@ -1831,6 +1831,7 @@ int __init acpi_scan_init(void) @@
     	}
     	acpi_power_init();
+    	acpi_pci_root_init();
     	/*
     	 * Enumerate devices in the ACPI namespace.
@@ Expand Down @@