aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/512x/clock.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-19 14:38:23 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-19 14:38:23 +1100
commit87d31345c0a90ccdf185feed9923ed14764f45dc (patch)
tree2816764e59f93379e0e3843fa0c417aafe02c503 /arch/powerpc/platforms/512x/clock.c
parente98efaf303ccbff11522a054d155593d7f2bb41f (diff)
parentd24720a45ad2928f687c6371482cdfba19b74fc5 (diff)
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/platforms/512x/clock.c')
-rw-r--r--arch/powerpc/platforms/512x/clock.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index 84544d07204..4c42246b86a 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -698,8 +698,7 @@ static struct clk_interface mpc5121_clk_functions = {
.clk_get_parent = NULL,
};
-static int
-mpc5121_clk_init(void)
+int __init mpc5121_clk_init(void)
{
struct device_node *np;
@@ -724,6 +723,3 @@ mpc5121_clk_init(void)
clk_functions = mpc5121_clk_functions;
return 0;
}
-
-
-arch_initcall(mpc5121_clk_init);