diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /drivers/watchdog/sb_wdog.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/sb_wdog.c')
| -rw-r--r-- | drivers/watchdog/sb_wdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index c8eadd478175..88c83aa57303 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
| @@ -67,8 +67,8 @@ static DEFINE_SPINLOCK(sbwd_lock); | |||
| 67 | void sbwdog_set(char __iomem *wdog, unsigned long t) | 67 | void sbwdog_set(char __iomem *wdog, unsigned long t) |
| 68 | { | 68 | { |
| 69 | spin_lock(&sbwd_lock); | 69 | spin_lock(&sbwd_lock); |
| 70 | __raw_writeb(0, wdog - 0x10); | 70 | __raw_writeb(0, wdog); |
| 71 | __raw_writeq(t & 0x7fffffUL, wdog); | 71 | __raw_writeq(t & 0x7fffffUL, wdog - 0x10); |
| 72 | spin_unlock(&sbwd_lock); | 72 | spin_unlock(&sbwd_lock); |
| 73 | } | 73 | } |
| 74 | 74 | ||