From 8ffd822bc656df1a4e977f86e67d08854ee3f70c Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 25 Jan 2010 10:39:23 +0900
Subject: [PATCH] --- yaml --- r: 187415 b: refs/heads/master c:
 ab5d97db1c6ced3e95c00d097931471707032b1f h: refs/heads/master i:   187413:
 5d970f363d88185e2294991dcdf62422dfb11901   187411:
 85163a57c5b65c19776a9fcf484891486a94a0b9   187407:
 b663fadc9c22a7d0cae2bb2cbe529c722becd968 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/plat-samsung/clock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d050f0569d44..c3a49be59fd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b56704f78b2667fc8f61d2f398931fbc032b62
+refs/heads/master: ab5d97db1c6ced3e95c00d097931471707032b1f
diff --git a/trunk/arch/arm/plat-samsung/clock.c b/trunk/arch/arm/plat-samsung/clock.c
index 0c746ae7b2a6..e9cdbe47beb6 100644
--- a/trunk/arch/arm/plat-samsung/clock.c
+++ b/trunk/arch/arm/plat-samsung/clock.c
@@ -344,7 +344,7 @@ int s3c24xx_register_clocks(struct clk **clks, int nr_clks)
  * Call s3c24xx_register_clock() on the @clkp array given, printing an
  * error if it fails to register the clock (unlikely).
  */
-void __initdata s3c_register_clocks(struct clk *clkp, int nr_clks)
+void __init s3c_register_clocks(struct clk *clkp, int nr_clks)
 {
 	int ret;