From 6390e760176101c7fcf5a58b97925ac0a8e8a820 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 3 Apr 2012 12:34:57 +0200
Subject: [PATCH] --- yaml --- r: 308232 b: refs/heads/master c:
 4e7b6c9a6b4700cf121a0d5924f193db83cbd008 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/imx2_wdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f6ab3e6c711..63aa6bf247fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60178b6329259457013d0e39cbee22aec0230dfb
+refs/heads/master: 4e7b6c9a6b4700cf121a0d5924f193db83cbd008
diff --git a/trunk/drivers/watchdog/imx2_wdt.c b/trunk/drivers/watchdog/imx2_wdt.c
index 7a2b734fcdc7..bcfab2b00ad2 100644
--- a/trunk/drivers/watchdog/imx2_wdt.c
+++ b/trunk/drivers/watchdog/imx2_wdt.c
@@ -121,7 +121,7 @@ static void imx2_wdt_start(void)
 {
 	if (!test_and_set_bit(IMX2_WDT_STATUS_STARTED, &imx2_wdt.status)) {
 		/* at our first start we enable clock and do initialisations */
-		clk_enable(imx2_wdt.clk);
+		clk_prepare_enable(imx2_wdt.clk);
 
 		imx2_wdt_setup();
 	} else	/* delete the timer that pings the watchdog after close */