diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 09:40:31 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 09:40:31 -0500 |
commit | 8cb34d291d3bcf03f284a4c44c9d618ffc278a9d (patch) | |
tree | ccc44835510ae8c7604587e285b4eca5b002e29e /arch/powerpc/platforms/40x | |
parent | 990116237092460d886660f31b3c6f602749654a (diff) |
[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>
Diffstat (limited to 'arch/powerpc/platforms/40x')
-rw-r--r-- | arch/powerpc/platforms/40x/ep405.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/kilauea.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/makalu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/walnut.c | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c index 759d937cdb65..8f73b6222e8b 100644 --- a/arch/powerpc/platforms/40x/ep405.c +++ b/arch/powerpc/platforms/40x/ep405.c | |||
@@ -48,7 +48,7 @@ static void __iomem *bcsr_regs; | |||
48 | /* there's more, can't be bothered typing them tho */ | 48 | /* there's more, can't be bothered typing them tho */ |
49 | 49 | ||
50 | 50 | ||
51 | static struct of_device_id ep405_of_bus[] = { | 51 | static __initdata struct of_device_id ep405_of_bus[] = { |
52 | { .compatible = "ibm,plb3", }, | 52 | { .compatible = "ibm,plb3", }, |
53 | { .compatible = "ibm,opb", }, | 53 | { .compatible = "ibm,opb", }, |
54 | { .compatible = "ibm,ebc", }, | 54 | { .compatible = "ibm,ebc", }, |
diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c index 4470940065b7..a23368042e67 100644 --- a/arch/powerpc/platforms/40x/kilauea.c +++ b/arch/powerpc/platforms/40x/kilauea.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/uic.h> | 21 | #include <asm/uic.h> |
22 | #include <asm/pci-bridge.h> | 22 | #include <asm/pci-bridge.h> |
23 | 23 | ||
24 | static struct of_device_id kilauea_of_bus[] = { | 24 | static __initdata struct of_device_id kilauea_of_bus[] = { |
25 | { .compatible = "ibm,plb4", }, | 25 | { .compatible = "ibm,plb4", }, |
26 | { .compatible = "ibm,opb", }, | 26 | { .compatible = "ibm,opb", }, |
27 | { .compatible = "ibm,ebc", }, | 27 | { .compatible = "ibm,ebc", }, |
diff --git a/arch/powerpc/platforms/40x/makalu.c b/arch/powerpc/platforms/40x/makalu.c index 780f5ec1aa48..68bad7764522 100644 --- a/arch/powerpc/platforms/40x/makalu.c +++ b/arch/powerpc/platforms/40x/makalu.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/uic.h> | 21 | #include <asm/uic.h> |
22 | #include <asm/pci-bridge.h> | 22 | #include <asm/pci-bridge.h> |
23 | 23 | ||
24 | static struct of_device_id makalu_of_bus[] = { | 24 | static __initdata struct of_device_id makalu_of_bus[] = { |
25 | { .compatible = "ibm,plb4", }, | 25 | { .compatible = "ibm,plb4", }, |
26 | { .compatible = "ibm,opb", }, | 26 | { .compatible = "ibm,opb", }, |
27 | { .compatible = "ibm,ebc", }, | 27 | { .compatible = "ibm,ebc", }, |
diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c index aea97017a7d4..a968e88a58a7 100644 --- a/arch/powerpc/platforms/40x/walnut.c +++ b/arch/powerpc/platforms/40x/walnut.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <asm/uic.h> | 26 | #include <asm/uic.h> |
27 | #include <asm/pci-bridge.h> | 27 | #include <asm/pci-bridge.h> |
28 | 28 | ||
29 | static struct of_device_id walnut_of_bus[] = { | 29 | static __initdata struct of_device_id walnut_of_bus[] = { |
30 | { .compatible = "ibm,plb3", }, | 30 | { .compatible = "ibm,plb3", }, |
31 | { .compatible = "ibm,opb", }, | 31 | { .compatible = "ibm,opb", }, |
32 | { .compatible = "ibm,ebc", }, | 32 | { .compatible = "ibm,ebc", }, |
@@ -38,7 +38,6 @@ static int __init walnut_device_probe(void) | |||
38 | if (!machine_is(walnut)) | 38 | if (!machine_is(walnut)) |
39 | return 0; | 39 | return 0; |
40 | 40 | ||
41 | /* FIXME: do bus probe here */ | ||
42 | of_platform_bus_probe(NULL, walnut_of_bus, NULL); | 41 | of_platform_bus_probe(NULL, walnut_of_bus, NULL); |
43 | 42 | ||
44 | return 0; | 43 | return 0; |