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 master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
char
/
watchdog
/
sc520_wdt.c
diff --git
a/drivers/char/watchdog/sc520_wdt.c
b/drivers/char/watchdog/sc520_wdt.c
index
2c7c9db
..
caec37b
100644
(file)
--- a/
drivers/char/watchdog/sc520_wdt.c
+++ b/
drivers/char/watchdog/sc520_wdt.c
@@
-290,7
+290,7
@@
static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch(cmd)
{
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
case WDIOC_GETSTATUS: