---

yaml --- r: 93463 b: refs/heads/master c: 7cfb62a h: refs/heads/master i: 93461: 9a089d2 93459: d4e2304 93455: 9b093e1 v: v3
git-mirror · Apr 24, 2008 · 7827c2f · 7827c2f
1 parent 2747618
commit 7827c2f
Show file tree

Hide file tree

Showing 9 changed files with 434 additions and 316 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f8a2c4c61e3559a95190e457b431c6900859b4
+refs/heads/master: 7cfb62a2e820b6032c08835dbd996d8518af14a3
diff --git a/trunk/arch/powerpc/kernel/of_platform.c b/trunk/arch/powerpc/kernel/of_platform.c
@@ -275,6 +275,8 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
 
 	/* Scan the bus */
 	scan_phb(phb);
+	if (phb->bus == NULL)
+		return -ENXIO;
 
 	/* Claim resources. This might need some rework as well depending
 	 * wether we are doing probe-only or not, like assigning unassigned

diff --git a/trunk/arch/powerpc/platforms/cell/Makefile b/trunk/arch/powerpc/platforms/cell/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_PPC_CELL_NATIVE)		+= interrupt.o iommu.o setup.o \
 					   cbe_regs.o spider-pic.o \
-					   pervasive.o pmu.o io-workarounds.o
+					   pervasive.o pmu.o io-workarounds.o \
+					   spider-pci.o
 obj-$(CONFIG_CBE_RAS)			+= ras.o
 
 obj-$(CONFIG_CBE_THERM)			+= cbe_thermal.o