---

yaml --- r: 295782 b: refs/heads/master c: 84c36ff h: refs/heads/master v: v3
git-mirror · Mar 12, 2012 · d6b0cfd · d6b0cfd
1 parent 91251ec
commit d6b0cfd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c953efdbb1b4f6804a476329a2df8bdab3a76019
+refs/heads/master: 84c36ffd7c580e1a63d7284e318670b082260118
diff --git a/trunk/include/linux/sh_clk.h b/trunk/include/linux/sh_clk.h
@@ -18,9 +18,8 @@ struct clk_mapping {
 	struct kref		ref;
 };
 
-#define sh_clk_ops clk_ops
 
-struct clk_ops {
+struct sh_clk_ops {
 #ifdef CONFIG_SH_CLK_CPG_LEGACY
 	void (*init)(struct clk *clk);
 #endif
@@ -39,7 +38,7 @@ struct clk {
 	unsigned short		parent_num;	/* choose between */
 	unsigned char		src_shift;	/* source clock field in the */
 	unsigned char		src_width;	/* configuration register */
-	struct clk_ops		*ops;
+	struct sh_clk_ops	*ops;
 
 	struct list_head	children;
 	struct list_head	sibling;	/* node for children */