]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Fix up duplicate '__s3c2410wdt_stop()' function
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Aug 2008 01:10:12 +0000 (18:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Aug 2008 01:10:12 +0000 (18:10 -0700)
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>
drivers/watchdog/s3c2410_wdt.c

index 44bf5e4282e1e089ae7ba486c67e52b1e1d62a7e..c417fb5e913fadd9a3f141117bb7385340cd3787 100644 (file)
@@ -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;