diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 10:37:43 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 10:37:43 +0100 |
commit | 04dfcfcb54b073133bcca2c8f25b55e904558931 (patch) | |
tree | 123d13f9e242751f629924e92fcb297dc669d767 /arch/arm/plat-s3c64xx/clock.c | |
parent | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (diff) | |
parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
download | blackbird-op-linux-04dfcfcb54b073133bcca2c8f25b55e904558931.tar.gz blackbird-op-linux-04dfcfcb54b073133bcca2c8f25b55e904558931.zip |
Merge branch 'linus' into core/iommu
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 = { &clk_48m, }; -void s3c64xx_register_clocks(void) +void __init s3c64xx_register_clocks(void) { struct clk *clkp; int ret; |