summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-02-29 22:18:19 +0900
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-12 22:19:13 +0100
commit84c36ffd7c580e1a63d7284e318670b082260118 (patch)
treeb155688ae029d3c66f87e8d401ce76a41993875f
parentc953efdbb1b4f6804a476329a2df8bdab3a76019 (diff)
downloadlinux-stable-84c36ffd7c580e1a63d7284e318670b082260118.tar.gz
linux-stable-84c36ffd7c580e1a63d7284e318670b082260118.tar.bz2
linux-stable-84c36ffd7c580e1a63d7284e318670b082260118.zip
sh: remove clk_ops
Now when all clk_ops have been renamed it is safe to rename clk_ops to sh_clk_ops. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--include/linux/sh_clk.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
index 706c005cd4ba..0a9d8f2ac519 100644
--- a/include/linux/sh_clk.h
+++ b/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 */