diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:10:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:10:12 -0700 |
| commit | c1ec8295f6e8c888230bbc9b7a416dc26d03688e (patch) | |
| tree | 52198f5cedfd1fa6464945ad72d345cf1c2019a2 /drivers/watchdog | |
| parent | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (diff) | |
| download | talos-obmc-linux-c1ec8295f6e8c888230bbc9b7a416dc26d03688e.tar.gz talos-obmc-linux-c1ec8295f6e8c888230bbc9b7a416dc26d03688e.zip | |
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 44bf5e4282e1..c417fb5e913f 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -119,17 +119,6 @@ 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; - wtcon = readl(wdt_base + S3C2410_WTCON); wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); writel(wtcon, wdt_base + S3C2410_WTCON); |
