diff options
author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
tree | fcdedce488db0f80c7a816e0b52df83a01972838 /arch/arm/plat-s3c64xx/clock.c | |
parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'arch/arm/plat-s3c64xx/clock.c')
-rw-r--r-- | arch/arm/plat-s3c64xx/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c index 136c982c68e..ad1b9682c9c 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 | ||
251 | void s3c64xx_register_clocks(void) | 251 | void __init s3c64xx_register_clocks(void) |
252 | { | 252 | { |
253 | struct clk *clkp; | 253 | struct clk *clkp; |
254 | int ret; | 254 | int ret; |