aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c64xx/clock.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-06 16:53:05 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-06 16:53:05 -0500
commit74fac66e821475f5cb0f23bb5ecc7e18aa32fdc5 (patch)
treeba6562cb63297c126016d02dd214a9dca5652cf4 /arch/arm/plat-s3c64xx/clock.c
parentef449e6d21b6e560c7ec36ed285ec3a34e0b12ed (diff)
parent1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (diff)
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/plat-s3c64xx/clock.c')
-rw-r--r--arch/arm/plat-s3c64xx/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c
index 136c982c68e1..ad1b9682c9c3 100644
--- a/arch/arm/plat-s3c64xx/clock.c
+++ b/arch/arm/plat-s3c64xx/clock.c
@@ -248,7 +248,7 @@ static struct clk *clks[] __initdata = {
248 &clk_48m, 248 &clk_48m,
249}; 249};
250 250
251void s3c64xx_register_clocks(void) 251void __init s3c64xx_register_clocks(void)
252{ 252{
253 struct clk *clkp; 253 struct clk *clkp;
254 int ret; 254 int ret;