Browse Source

[POWERPC] 4xx: Mark of_bus structures as __initdata

Mark the of_device_id structures used to probe the various busses on 4xx
as __initdata.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Josh Boyer 17 years ago
parent
commit
8cb34d291d

+ 1 - 1
arch/powerpc/platforms/40x/ep405.c

@@ -48,7 +48,7 @@ static void __iomem *bcsr_regs;
 /* there's more, can't be bothered typing them tho */
 
 
-static struct of_device_id ep405_of_bus[] = {
+static __initdata struct of_device_id ep405_of_bus[] = {
 	{ .compatible = "ibm,plb3", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/40x/kilauea.c

@@ -21,7 +21,7 @@
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
 
-static struct of_device_id kilauea_of_bus[] = {
+static __initdata struct of_device_id kilauea_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/40x/makalu.c

@@ -21,7 +21,7 @@
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
 
-static struct of_device_id makalu_of_bus[] = {
+static __initdata struct of_device_id makalu_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 2
arch/powerpc/platforms/40x/walnut.c

@@ -26,7 +26,7 @@
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
 
-static struct of_device_id walnut_of_bus[] = {
+static __initdata struct of_device_id walnut_of_bus[] = {
 	{ .compatible = "ibm,plb3", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },
@@ -38,7 +38,6 @@ static int __init walnut_device_probe(void)
 	if (!machine_is(walnut))
 		return 0;
 
-	/* FIXME: do bus probe here */
 	of_platform_bus_probe(NULL, walnut_of_bus, NULL);
 
 	return 0;

+ 1 - 1
arch/powerpc/platforms/44x/bamboo.c

@@ -25,7 +25,7 @@
 
 #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", },

+ 1 - 1
arch/powerpc/platforms/44x/ebony.c

@@ -28,7 +28,7 @@
 
 #include "44x.h"
 
-static struct of_device_id ebony_of_bus[] = {
+static __initdata struct of_device_id ebony_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/44x/katmai.c

@@ -25,7 +25,7 @@
 
 #include "44x.h"
 
-static struct of_device_id katmai_of_bus[] = {
+static __initdata struct of_device_id katmai_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/44x/rainier.c

@@ -23,7 +23,7 @@
 #include <asm/pci-bridge.h>
 #include "44x.h"
 
-static struct of_device_id rainier_of_bus[] = {
+static __initdata struct of_device_id rainier_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/44x/sequoia.c

@@ -25,7 +25,7 @@
 
 #include "44x.h"
 
-static struct of_device_id sequoia_of_bus[] = {
+static __initdata struct of_device_id sequoia_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },

+ 1 - 1
arch/powerpc/platforms/44x/taishan.c

@@ -32,7 +32,7 @@
 
 #include "44x.h"
 
-static struct of_device_id taishan_of_bus[] = {
+static __initdata struct of_device_id taishan_of_bus[] = {
 	{ .compatible = "ibm,plb4", },
 	{ .compatible = "ibm,opb", },
 	{ .compatible = "ibm,ebc", },