commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / watchdog / ib700wdt.c

diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/char/watchdog/ib700wdt.c
index 700e91d..3cb496f 100644 (file)
--- a/drivers/char/watchdog/ib700wdt.c
+++ b/drivers/char/watchdog/ib700wdt.c
@@ -42,6 +42,7 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/moduleparam.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -122,7 +123,7 @@ static int nowayout = 1;
 static int nowayout = 0;
 #endif
 
-MODULE_PARM(nowayout,"i");
+module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
 
 
@@ -165,12 +166,6 @@ ibwdt_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
        return 0;
 }
 
-static ssize_t
-ibwdt_read(struct file *file, char *buf, size_t count, loff_t *ppos)
-{
-       return -EINVAL;
-}
-
 static int
 ibwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
          unsigned long arg)
@@ -279,7 +274,6 @@ ibwdt_notify_sys(struct notifier_block *this, unsigned long code,
 
 static struct file_operations ibwdt_fops = {
        .owner          = THIS_MODULE,
-       .read           = ibwdt_read,
        .write          = ibwdt_write,
        .ioctl          = ibwdt_ioctl,
        .open           = ibwdt_open,