diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /arch/arm/plat-s3c64xx/clock.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
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 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 | ||
| 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; |