From 90639b8a6ac0529de9461d54624ab187b95ba10d Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 29 Feb 2012 22:16:36 +0900 Subject: [PATCH] --- yaml --- r: 295769 b: refs/heads/master c: 9c8c7abc253ad365dccd737262abd0010a8000b2 h: refs/heads/master i: 295767: e9e62e183b79b38fffd14afc4a11da26b8e6e6ac v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/clock-sh7377.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a89208b9224..4ca03e8ce13e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79ff3121039c581faf868ee9ce52279a257f6f89 +refs/heads/master: 9c8c7abc253ad365dccd737262abd0010a8000b2 diff --git a/trunk/arch/arm/mach-shmobile/clock-sh7377.c b/trunk/arch/arm/mach-shmobile/clock-sh7377.c index 8cee7b151ae3..081ecee1fae7 100644 --- a/trunk/arch/arm/mach-shmobile/clock-sh7377.c +++ b/trunk/arch/arm/mach-shmobile/clock-sh7377.c @@ -77,7 +77,7 @@ static unsigned long div2_recalc(struct clk *clk) return clk->parent->rate / 2; } -static struct clk_ops div2_clk_ops = { +static struct sh_clk_ops div2_clk_ops = { .recalc = div2_recalc, }; @@ -110,7 +110,7 @@ static unsigned long pllc1_recalc(struct clk *clk) return clk->parent->rate * mult; } -static struct clk_ops pllc1_clk_ops = { +static struct sh_clk_ops pllc1_clk_ops = { .recalc = pllc1_recalc, }; @@ -137,7 +137,7 @@ static unsigned long pllc2_recalc(struct clk *clk) return clk->parent->rate * mult; } -static struct clk_ops pllc2_clk_ops = { +static struct sh_clk_ops pllc2_clk_ops = { .recalc = pllc2_recalc, };