diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /drivers/watchdog/sb_wdog.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
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 | ||