From 91251ec01e0910d5caab4500845ca72efa5bb937 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 29 Feb 2012 22:18:11 +0900
Subject: [PATCH] --- yaml --- r: 295781 b: refs/heads/master c:
 c953efdbb1b4f6804a476329a2df8bdab3a76019 h: refs/heads/master i:   295779:
 66325ec7aa29dbac7f4488cd19ecf4d29e5c4170 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/sh/boards/mach-highlander/setup.c | 2 +-
 trunk/arch/sh/boards/mach-sdk7786/setup.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5daa4b0eb032..0ec8f353da87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e679b0b7a07bcf2ff2322bb97f977c81eca6030
+refs/heads/master: c953efdbb1b4f6804a476329a2df8bdab3a76019
diff --git a/trunk/arch/sh/boards/mach-highlander/setup.c b/trunk/arch/sh/boards/mach-highlander/setup.c
index 74b8db1b74a9..4a52590fe3d8 100644
--- a/trunk/arch/sh/boards/mach-highlander/setup.c
+++ b/trunk/arch/sh/boards/mach-highlander/setup.c
@@ -322,7 +322,7 @@ static void ivdr_clk_disable(struct clk *clk)
 	__raw_writew(__raw_readw(PA_IVDRCTL) & ~(1 << IVDR_CK_ON), PA_IVDRCTL);
 }
 
-static struct clk_ops ivdr_clk_ops = {
+static struct sh_clk_ops ivdr_clk_ops = {
 	.enable		= ivdr_clk_enable,
 	.disable	= ivdr_clk_disable,
 };
diff --git a/trunk/arch/sh/boards/mach-sdk7786/setup.c b/trunk/arch/sh/boards/mach-sdk7786/setup.c
index 486d1ac3694c..27a2314f50ac 100644
--- a/trunk/arch/sh/boards/mach-sdk7786/setup.c
+++ b/trunk/arch/sh/boards/mach-sdk7786/setup.c
@@ -167,7 +167,7 @@ static void sdk7786_pcie_clk_disable(struct clk *clk)
 	fpga_write_reg(fpga_read_reg(PCIECR) & ~PCIECR_CLKEN, PCIECR);
 }
 
-static struct clk_ops sdk7786_pcie_clk_ops = {
+static struct sh_clk_ops sdk7786_pcie_clk_ops = {
 	.enable		= sdk7786_pcie_clk_enable,
 	.disable	= sdk7786_pcie_clk_disable,
 };