From d6b0cfd38a28a887c9de82bb0bcba1bc7894fd6c Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 29 Feb 2012 22:18:19 +0900 Subject: [PATCH] --- yaml --- r: 295782 b: refs/heads/master c: 84c36ffd7c580e1a63d7284e318670b082260118 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/sh_clk.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0ec8f353da87..201b35a325c7 100644 --- 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 index 706c005cd4ba..0a9d8f2ac519 100644 --- 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 */