git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
watchdog
/
sb_wdog.c
diff --git
a/drivers/watchdog/sb_wdog.c
b/drivers/watchdog/sb_wdog.c
index
c8eadd4
..
88c83aa
100644
(file)
--- a/
drivers/watchdog/sb_wdog.c
+++ b/
drivers/watchdog/sb_wdog.c
@@
-67,8
+67,8
@@
static DEFINE_SPINLOCK(sbwd_lock);
void sbwdog_set(char __iomem *wdog, unsigned long t)
{
spin_lock(&sbwd_lock);
void sbwdog_set(char __iomem *wdog, unsigned long t)
{
spin_lock(&sbwd_lock);
- __raw_writeb(0, wdog
- 0x10
);
- __raw_writeq(t & 0x7fffffUL, wdog);
+ __raw_writeb(0, wdog);
+ __raw_writeq(t & 0x7fffffUL, wdog
- 0x10
);
spin_unlock(&sbwd_lock);
}
spin_unlock(&sbwd_lock);
}