Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / include / linux / sh_clk.h

diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
index 54341d811685a2088897491c2255ba605b71ab43..0a9d8f2ac51908958776115b8d1ff5d2cbbc5b6d 100644 (file)
--- a/include/linux/sh_clk.h
+++ b/include/linux/sh_clk.h
@@ -18,7 +18,8 @@ struct clk_mapping {
        struct kref             ref;
 };
 
-struct clk_ops {
+
+struct sh_clk_ops {
 #ifdef CONFIG_SH_CLK_CPG_LEGACY
        void (*init)(struct clk *clk);
 #endif
@@ -37,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 */