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 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
char
/
watchdog
/
shwdt.c
diff --git
a/drivers/char/watchdog/shwdt.c
b/drivers/char/watchdog/shwdt.c
index
e5b8c64
..
dc40362
100644
(file)
--- a/
drivers/char/watchdog/shwdt.c
+++ b/
drivers/char/watchdog/shwdt.c
@@
-360,7
+360,7
@@
static int sh_wdt_ioctl(struct inode *inode, struct file *file,
return retval;
default:
return retval;
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
return 0;
}
return 0;