fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / char / watchdog / ibmasr.c

diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index 294c474..dd6760f 100644 (file)
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -10,7 +10,6 @@
  * of the GNU Public License, incorporated herein by reference.
  */
 
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -296,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)
@@ -323,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,