From f8071da57719163fa07c7dc289b0853509bffb9f Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Fri, 15 Jul 2011 11:04:01 -0400
Subject: [PATCH] --- yaml --- r: 261096 b: refs/heads/master c:
 da3e515024ba32aaf0d524518ce39a8fb77332cd h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/watchdog/sp805_wdt.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2ddca0543bd..6ce80c84ac75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5a427eedeead2be82561497a12788bd1f0c07d3
+refs/heads/master: da3e515024ba32aaf0d524518ce39a8fb77332cd
diff --git a/trunk/drivers/watchdog/sp805_wdt.c b/trunk/drivers/watchdog/sp805_wdt.c
index 0d80e08b6439..c1e099aa57f3 100644
--- a/trunk/drivers/watchdog/sp805_wdt.c
+++ b/trunk/drivers/watchdog/sp805_wdt.c
@@ -144,7 +144,6 @@ static void wdt_disable(void)
 
 	writel(UNLOCK, wdt->base + WDTLOCK);
 	writel(0, wdt->base + WDTCONTROL);
-	writel(0, wdt->base + WDTLOAD);
 	writel(LOCK, wdt->base + WDTLOCK);
 
 	spin_unlock(&wdt->lock);