From 6597d5e115de9ef691cf7eae5c2ab0f67025b5ee Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 29 Feb 2012 22:17:00 +0900
Subject: [PATCH] --- yaml --- r: 295772 b: refs/heads/master c:
 d9f8670df8c6eb4c0726ea3fa8ff8bc712702500 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-shmobile/clock-r8a7740.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b85726696f28..7a4c1c739d9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bcda508bfd9715c1a6a0589107c8c9d508f732e
+refs/heads/master: d9f8670df8c6eb4c0726ea3fa8ff8bc712702500
diff --git a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c
index 3b35b9afc001..6a406844c3de 100644
--- a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -93,7 +93,7 @@ static unsigned long div_recalc(struct clk *clk)
 	return clk->parent->rate / (int)(clk->priv);
 }
 
-static struct clk_ops div_clk_ops = {
+static struct sh_clk_ops div_clk_ops = {
 	.recalc	= div_recalc,
 };
 
@@ -125,7 +125,7 @@ static struct clk extal2_div2_clk = {
 	.parent	= &extal2_clk,
 };
 
-static struct clk_ops followparent_clk_ops = {
+static struct sh_clk_ops followparent_clk_ops = {
 	.recalc	= followparent_recalc,
 };
 
@@ -156,7 +156,7 @@ static unsigned long pllc01_recalc(struct clk *clk)
 	return clk->parent->rate * mult;
 }
 
-static struct clk_ops pllc01_clk_ops = {
+static struct sh_clk_ops pllc01_clk_ops = {
 	.recalc		= pllc01_recalc,
 };