From 32b7a5d894b60c745c1da60655f891d9ed829f99 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 29 Feb 2012 22:17:08 +0900
Subject: [PATCH] --- yaml --- r: 295773 b: refs/heads/master c:
 ae8d1949022d377da45bbe4410c53ad4aaf9865e h: refs/heads/master i:   295771:
 d185f420e75f1ff04700fbc7bcbd55a3748c068b v: v3

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

diff --git a/[refs] b/[refs]
index 7a4c1c739d9c..f5ba45d0158f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9f8670df8c6eb4c0726ea3fa8ff8bc712702500
+refs/heads/master: ae8d1949022d377da45bbe4410c53ad4aaf9865e
diff --git a/trunk/arch/arm/mach-shmobile/clock-r8a7779.c b/trunk/arch/arm/mach-shmobile/clock-r8a7779.c
index b4b0e8cd096d..317ab525ce20 100644
--- a/trunk/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -107,7 +107,7 @@ static unsigned long mul4_recalc(struct clk *clk)
 	return clk->parent->rate * 4;
 }
 
-static struct clk_ops mul4_clk_ops = {
+static struct sh_clk_ops mul4_clk_ops = {
 	.recalc		= mul4_recalc,
 };