From 1182648c093e4263d237e149a0c0f30d431b7a59 Mon Sep 17 00:00:00 2001
From: Rafael Ignacio Zurita <rizurita@yahoo.com>
Date: Mon, 14 Sep 2009 03:01:58 +0000
Subject: [PATCH] --- yaml --- r: 163574 b: refs/heads/master c:
 2fd5a021071ef54c503ab8d9894acae3eccf4f92 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/sh/kernel/cpu/sh3/clock-sh7709.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 6c4f65e2942e..e35edc752aab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a78ec16ca40cc98e387b2d8d80adbeedda02bbc
+refs/heads/master: 2fd5a021071ef54c503ab8d9894acae3eccf4f92
diff --git a/trunk/arch/sh/kernel/cpu/sh3/clock-sh7709.c b/trunk/arch/sh/kernel/cpu/sh3/clock-sh7709.c
index fa30b6017730..e8749505bd2a 100644
--- a/trunk/arch/sh/kernel/cpu/sh3/clock-sh7709.c
+++ b/trunk/arch/sh/kernel/cpu/sh3/clock-sh7709.c
@@ -22,13 +22,6 @@ static int stc_multipliers[] = { 1, 2, 4, 8, 3, 6, 1, 1 };
 static int ifc_divisors[]    = { 1, 2, 4, 1, 3, 1, 1, 1 };
 static int pfc_divisors[]    = { 1, 2, 4, 1, 3, 6, 1, 1 };
 
-static void set_bus_parent(struct clk *clk)
-{
-	struct clk *bus_clk = clk_get(NULL, "bus_clk");
-	clk->parent = bus_clk;
-	clk_put(bus_clk);
-}
-
 static void master_clk_init(struct clk *clk)
 {
 	int frqcr = ctrl_inw(FRQCR);
@@ -50,9 +43,6 @@ static unsigned long module_clk_recalc(struct clk *clk)
 }
 
 static struct clk_ops sh7709_module_clk_ops = {
-#ifdef CLOCK_MODE_0_1_2_7
-	.init		= set_bus_parent,
-#endif
 	.recalc		= module_clk_recalc,
 };
 
@@ -78,7 +68,6 @@ static unsigned long cpu_clk_recalc(struct clk *clk)
 }
 
 static struct clk_ops sh7709_cpu_clk_ops = {
-	.init		= set_bus_parent,
 	.recalc		= cpu_clk_recalc,
 };