From 61bdfd569ae63823a636994579bdaa597c39e850 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Aug 2008 18:10:12 -0700
Subject: [PATCH] --- yaml --- r: 107911 b: refs/heads/master c:
 c1ec8295f6e8c888230bbc9b7a416dc26d03688e h: refs/heads/master i:   107909:
 9e62c8135bcb61471a8e311fc556b994e4261022   107907:
 bb4bc4c5fe5f566185cdaca8de98f8d03bae9d32   107903:
 876f998c0a607db226c271386c7bcf35d4e29e59 v: v3

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

diff --git a/[refs] b/[refs]
index 2f8afd47146b..17d39a60ca7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8cd0c5d75c424f986c0602dc26579fbb7c8080
+refs/heads/master: c1ec8295f6e8c888230bbc9b7a416dc26d03688e
diff --git a/trunk/drivers/watchdog/s3c2410_wdt.c b/trunk/drivers/watchdog/s3c2410_wdt.c
index 44bf5e4282e1..c417fb5e913f 100644
--- a/trunk/drivers/watchdog/s3c2410_wdt.c
+++ b/trunk/drivers/watchdog/s3c2410_wdt.c
@@ -115,17 +115,6 @@ static void s3c2410wdt_keepalive(void)
 	spin_unlock(&wdt_lock);
 }
 
-static void __s3c2410wdt_stop(void)
-{
-	unsigned long wtcon;
-
-	spin_lock(&wdt_lock);
-	wtcon = readl(wdt_base + S3C2410_WTCON);
-	wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN);
-	writel(wtcon, wdt_base + S3C2410_WTCON);
-	spin_unlock(&wdt_lock);
-}
-
 static void __s3c2410wdt_stop(void)
 {
 	unsigned long wtcon;