---

yaml --- r: 187338 b: refs/heads/master c: ed27684 h: refs/heads/master v: v3
git-mirror · Jan 15, 2010 · e4b96b8 · e4b96b8
1 parent 2c28c88
commit e4b96b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14235696d401e62f8f5740ca2fb917ab42b9fd18
+refs/heads/master: ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6
diff --git a/trunk/arch/arm/plat-s5pc1xx/clock.c b/trunk/arch/arm/plat-s5pc1xx/clock.c
@@ -64,16 +64,6 @@ struct clk clk_54m = {
 	.rate		= 54000000,
 };
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
-{
-	clk->rate = rate;
-	return 0;
-}
-
-static struct clk_ops clk_ops_default_setrate = {
-	.set_rate	= clk_default_setrate,
-};
-
 static int clk_dummy_enable(struct clk *clk, int enable)
 {
 	return 0;
@@ -86,7 +76,7 @@ struct clk clk_hd0 = {
 	.parent		= NULL,
 	.ctrlbit	= 0,
 	.enable		= clk_dummy_enable,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 };
 
 struct clk clk_pd0 = {
@@ -95,7 +85,7 @@ struct clk clk_pd0 = {
 	.rate		= 0,
 	.parent		= NULL,
 	.ctrlbit	= 0,
-	.ops		= &clk_ops_default_setrate,
+	.ops		= &clk_ops_def_setrate,
 	.enable		= clk_dummy_enable,
 };
 

diff --git a/trunk/arch/arm/plat-samsung/clock.c b/trunk/arch/arm/plat-samsung/clock.c
@@ -225,13 +225,13 @@ EXPORT_SYMBOL(clk_set_parent);
 
 /* base clocks */
 
-static int clk_default_setrate(struct clk *clk, unsigned long rate)
+int clk_default_setrate(struct clk *clk, unsigned long rate)
 {
 	clk->rate = rate;
 	return 0;
 }
 
-static struct clk_ops clk_ops_def_setrate = {
+struct clk_ops clk_ops_def_setrate = {
 	.set_rate	= clk_default_setrate,
 };
 

diff --git a/trunk/arch/arm/plat-samsung/include/plat/clock.h b/trunk/arch/arm/plat-samsung/include/plat/clock.h
@@ -75,6 +75,9 @@ extern struct clk clk_h2;
 extern struct clk clk_27m;
 extern struct clk clk_48m;
 
+extern int clk_default_setrate(struct clk *clk, unsigned long rate);
+extern struct clk_ops clk_ops_def_setrate;
+
 /* exports for arch/arm/mach-s3c2410
  *
  * Please DO NOT use these outside of arch/arm/mach-s3c2410