From 60d029b51e536b2ce6a50fee5f577a79af0ff666 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Fri, 21 Dec 2012 00:36:40 +0100
Subject: [PATCH] --- yaml --- r: 350824 b: refs/heads/master c:
 92ef2a25c763338905dce8344a0584606f842920 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/internal.h | 1 +
 trunk/drivers/acpi/pci_root.c | 4 +---
 trunk/drivers/acpi/scan.c     | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0c33c948b18c..657a6cccf3ae 100644
--- 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
index 3c407cdc1ec1..e050254ae143 100644
--- 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
index 7928d4dc7056..a233fe93dfac 100644
--- 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
index 726f0d1ace4b..a7e81ac2cd0c 100644
--- 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.