Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[mirror_ubuntu-hirsute-kernel.git] / drivers / char / watchdog / ibmasr.c

diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index b0741cbdc139dd2f25c57f99dc8450f8d4d99ea7..dd6760f1a23ba43ecc40342cc9c1d9da3ef13e9c 100644 (file)
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -295,7 +295,7 @@ static int asr_ioctl(struct inode *inode, struct file *file,
                }
        }
 
-       return -ENOIOCTLCMD;
+       return -ENOTTY;
 }
 
 static int asr_open(struct inode *inode, struct file *file)
@@ -322,7 +322,7 @@ static int asr_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations asr_fops = {
+static const struct file_operations asr_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .write =        asr_write,