Merge branch 'master' into 83xx

[linux-2.6-omap-h63xx.git] / drivers / char / watchdog / mixcomwd.c

diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index 433c27f981595fd8597ce0ba8c64d8c85cfd9511..c2dac0aa1d6254906468a35dcbaea932197b416f 100644 (file)
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -185,12 +185,12 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
                        mixcomwd_ping();
                        break;
                default:
-                       return -ENOIOCTLCMD;
+                       return -ENOTTY;
        }
        return 0;
 }
 
-static struct file_operations mixcomwd_fops=
+static const struct file_operations mixcomwd_fops=
 {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,