git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] 4xx: Mark of_bus structures as __initdata
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
44x
/
bamboo.c
diff --git
a/arch/powerpc/platforms/44x/bamboo.c
b/arch/powerpc/platforms/44x/bamboo.c
index
470e1a3
..
d27f758
100644
(file)
--- a/
arch/powerpc/platforms/44x/bamboo.c
+++ b/
arch/powerpc/platforms/44x/bamboo.c
@@
-14,15
+14,18
@@
* option) any later version.
*/
#include <linux/init.h>
* option) any later version.
*/
#include <linux/init.h>
+#include <linux/of_platform.h>
+
#include <asm/machdep.h>
#include <asm/prom.h>
#include <asm/udbg.h>
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/machdep.h>
#include <asm/prom.h>
#include <asm/udbg.h>
#include <asm/time.h>
#include <asm/uic.h>
-#include <asm/of_platform.h>
+#include <asm/pci-bridge.h>
+
#include "44x.h"
#include "44x.h"
-static struct of_device_id bamboo_of_bus[] = {
+static
__initdata
struct of_device_id bamboo_of_bus[] = {
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
@@
-47,6
+50,8
@@
static int __init bamboo_probe(void)
if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
return 0;
if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
return 0;
+ ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+
return 1;
}
return 1;
}