From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Aug 2008 01:10:12 +0000 (-0700)
Subject: Fix up duplicate '__s3c2410wdt_stop()' function
X-Git-Tag: v2.6.27-rc3~76
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ec8295f6e8c888230bbc9b7a416dc26d03688e;p=linux-2.6

Fix up duplicate '__s3c2410wdt_stop()' function

Looks like somebody didn't get enough sleep.

Noticed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 44bf5e4282..c417fb5e91 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/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;