From 7d16e409db91a3218b29af2df08b2f469b1e2ea3 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 26 Jan 2010 20:12:57 -0700
Subject: [PATCH] --- yaml --- r: 184629 b: refs/heads/master c:
 0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44 h: refs/heads/master i:   184627:
 cdd3171eb09cf706f27667d6e022c9e5adafbb77 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap1/clock.c      | 6 ------
 trunk/arch/arm/mach-omap1/clock_data.c | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b3edda1746d8..25c087fc292e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9b98f6040f5a7a04d659759d83ea28d9c528800
+refs/heads/master: 0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44
diff --git a/trunk/arch/arm/mach-omap1/clock.c b/trunk/arch/arm/mach-omap1/clock.c
index 04f1d29cba2c..3e052f6532b1 100644
--- a/trunk/arch/arm/mach-omap1/clock.c
+++ b/trunk/arch/arm/mach-omap1/clock.c
@@ -52,12 +52,6 @@ const struct clkops clkops_dummy = {
 	.disable	= clk_omap1_dummy_disable,
 };
 
-/* XXX can be replaced with a fixed_divisor_recalc */
-unsigned long omap1_watchdog_recalc(struct clk *clk)
-{
-	return clk->parent->rate / 14;
-}
-
 unsigned long omap1_uart_recalc(struct clk *clk)
 {
 	unsigned int val = __raw_readl(clk->enable_reg);
diff --git a/trunk/arch/arm/mach-omap1/clock_data.c b/trunk/arch/arm/mach-omap1/clock_data.c
index 65e7b5b85d83..edefb3440d30 100644
--- a/trunk/arch/arm/mach-omap1/clock_data.c
+++ b/trunk/arch/arm/mach-omap1/clock_data.c
@@ -149,7 +149,8 @@ static struct arm_idlect1_clk armwdt_ck = {
 		.flags		= CLOCK_IDLE_CONTROL,
 		.enable_reg	= OMAP1_IO_ADDRESS(ARM_IDLECT2),
 		.enable_bit	= EN_WDTCK,
-		.recalc		= &omap1_watchdog_recalc,
+		.fixed_div	= 14,
+		.recalc		= &omap_fixed_divisor_recalc,
 	},
 	.idlect_shift	= 0,
 };