aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/512x/mpc5121_generic.c
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-02-16 10:35:13 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-02-16 10:35:13 -0700
commit284ed66fc3beca509a7549aae06af5c74023304c (patch)
tree16147ca13e10d4235b759d5b126c223f2f9f18c0 /arch/powerpc/platforms/512x/mpc5121_generic.c
parent724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff)
powerpc/mpc5121: avoid using arch_initcall for clock init
Move mpc5121_clk_init() call to platform init code so it won't get called on non-5121 platforms on a multiplatform kernel. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/platforms/512x/mpc5121_generic.c')
-rw-r--r--arch/powerpc/platforms/512x/mpc5121_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index 2479de9e2d1..9b8c9b0bedf 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -51,7 +51,7 @@ static int __init mpc5121_generic_probe(void)
define_machine(mpc5121_generic) {
.name = "MPC5121 generic",
.probe = mpc5121_generic_probe,
- .init = mpc512x_declare_of_platform_devices,
+ .init = mpc512x_init,
.init_IRQ = mpc512x_init_IRQ,
.get_irq = ipic_get_irq,
.calibrate_decr = generic_calibrate_decr,