From 6447e50a0fc7f99a46668c518a31f10ac8264c61 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 19 May 2011 21:59:23 -0500
Subject: [PATCH] --- yaml --- r: 259096 b: refs/heads/master c:
 6d251ddff82d61ebff211f95ce826f8d81283181 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/powerpc/platforms/85xx/corenet_ds.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 121627deb492..05501a0663ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c065488f1acfc0be75584c0fe156fc806820f39d
+refs/heads/master: 6d251ddff82d61ebff211f95ce826f8d81283181
diff --git a/trunk/arch/powerpc/platforms/85xx/corenet_ds.c b/trunk/arch/powerpc/platforms/85xx/corenet_ds.c
index 10af3c793b38..338e6dc31663 100644
--- a/trunk/arch/powerpc/platforms/85xx/corenet_ds.c
+++ b/trunk/arch/powerpc/platforms/85xx/corenet_ds.c
@@ -22,6 +22,7 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -90,6 +91,10 @@ void __init corenet_ds_setup_arch(void)
 					hose->dma_window_size);
 		}
 	}
+
+#ifdef CONFIG_PPC64
+	pci_devs_phb_init();
+#endif
 #endif
 
 #ifdef CONFIG_SWIOTLB