aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>2009-06-16 03:44:10 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-06-16 03:49:11 -0400
commit39f4490c70eae62cfed62081243110607069d3f9 (patch)
tree9bff3957de804ef6792069415a041d29cc17e6cf /arch/sh
parent02a146dffa471fec4c095c3810645df26ac86d5d (diff)
sh: Revised clock function in highlander
Clock function was changed, but highlander used old function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/mach-highlander/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index df054e54bab3..dd297d87f934 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -296,9 +296,10 @@ device_initcall(r7780rp_devices_setup);
296/* 296/*
297 * Platform specific clocks 297 * Platform specific clocks
298 */ 298 */
299static void ivdr_clk_enable(struct clk *clk) 299static int ivdr_clk_enable(struct clk *clk)
300{ 300{
301 ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << IVDR_CK_ON), PA_IVDRCTL); 301 ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << IVDR_CK_ON), PA_IVDRCTL);
302 return 0;
302} 303}
303 304
304static void ivdr_clk_disable(struct clk *clk) 305static void ivdr_clk_disable(struct clk *clk)