diff --git a/[refs] b/[refs]
index 242694e800b4..e5a9295c3f92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ac8ff2ce58138ba1339296406bde6636792bd8
+refs/heads/master: 0160f53e427e9f1f6d19b898867c105406037b6f
diff --git a/trunk/arch/ppc64/kernel/pSeries_setup.c b/trunk/arch/ppc64/kernel/pSeries_setup.c
index bfadccc7b8be..3009701eb90d 100644
--- a/trunk/arch/ppc64/kernel/pSeries_setup.c
+++ b/trunk/arch/ppc64/kernel/pSeries_setup.c
@@ -238,8 +238,8 @@ static void __init pSeries_setup_arch(void)
 
 	/* Find and initialize PCI host bridges */
 	init_pci_config_tokens();
-	eeh_init();
 	find_and_init_phbs();
+	eeh_init();
 
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;