From 65947d8768c5ac1b01e3a8ffe8ea09c62574d3a3 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Thu, 20 Dec 2007 08:55:34 -0600
Subject: [PATCH] --- yaml --- r: 81197 b: refs/heads/master c:
 4922566f0394ac41c72fb960f22b4f84333026bc h: refs/heads/master i:   81195:
 e7601ac513fe5d5e7eabc61bf455b8eb3c1c2d11 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/boot/cuboot-rainier.c   | 2 +-
 trunk/arch/powerpc/platforms/44x/rainier.c | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fde0bd84790e..a9699edc6a7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7baf9259c12cfbe927a674f3bd17d855d1e156
+refs/heads/master: 4922566f0394ac41c72fb960f22b4f84333026bc
diff --git a/trunk/arch/powerpc/boot/cuboot-rainier.c b/trunk/arch/powerpc/boot/cuboot-rainier.c
index 6be15cad2f7e..cf452b66dce8 100644
--- a/trunk/arch/powerpc/boot/cuboot-rainier.c
+++ b/trunk/arch/powerpc/boot/cuboot-rainier.c
@@ -51,6 +51,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	CUBOOT_INIT();
 	platform_ops.fixups = rainier_fixups;
 	platform_ops.exit = ibm44x_dbcr_reset;
-	ft_init(_dtb_start, 0, 32);
+	fdt_init(_dtb_start);
 	serial_console_init();
 }
diff --git a/trunk/arch/powerpc/platforms/44x/rainier.c b/trunk/arch/powerpc/platforms/44x/rainier.c
index 5a01bef21846..ce8167bb301f 100644
--- a/trunk/arch/powerpc/platforms/44x/rainier.c
+++ b/trunk/arch/powerpc/platforms/44x/rainier.c
@@ -20,6 +20,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/of_platform.h>
+#include <asm/pci-bridge.h>
 #include "44x.h"
 
 static struct of_device_id rainier_of_bus[] = {
@@ -47,6 +48,8 @@ static int __init rainier_probe(void)
 	if (!of_flat_dt_is_compatible(root, "amcc,rainier"))
 		return 0;
 
+	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+
 	return 1;
 }