git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
mpc83xx_wdt.c
diff --git
a/drivers/char/watchdog/mpc83xx_wdt.c
b/drivers/char/watchdog/mpc83xx_wdt.c
index
a480903
..
18ca752
100644
(file)
--- a/
drivers/char/watchdog/mpc83xx_wdt.c
+++ b/
drivers/char/watchdog/mpc83xx_wdt.c
@@
-125,7
+125,7
@@
static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
case WDIOC_GETTIMEOUT:
return put_user(timeout_sec, p);
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
}