Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 107911
b: refs/heads/master
c: c1ec829
h: refs/heads/master
i:
  107909: 9e62c81
  107907: bb4bc4c
  107903: 876f998
v: v3
  • Loading branch information
Linus Torvalds committed Aug 8, 2008
1 parent 707541b commit 61bdfd5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d8cd0c5d75c424f986c0602dc26579fbb7c8080
refs/heads/master: c1ec8295f6e8c888230bbc9b7a416dc26d03688e
11 changes: 0 additions & 11 deletions trunk/drivers/watchdog/s3c2410_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 61bdfd5

Please sign in to comment.