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 branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
watchdog
/
iop_wdt.c
diff --git
a/drivers/watchdog/iop_wdt.c
b/drivers/watchdog/iop_wdt.c
index
96eb2cb
..
0c90596
100644
(file)
--- a/
drivers/watchdog/iop_wdt.c
+++ b/
drivers/watchdog/iop_wdt.c
@@
-192,7
+192,7
@@
static int iop_wdt_release(struct inode *inode, struct file *file)
if (test_bit(WDT_ENABLED, &wdt_status))
state = wdt_disable();
- /* if the timer is not dis
ba
led reload and notify that we are still
+ /* if the timer is not dis
ab
led reload and notify that we are still
* going down
*/
if (state != 0) {