virtio_net: remove send queue

[safe/jmp/linux-2.6] / drivers / watchdog / iop_wdt.c

diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index e0d0a90..aef9478 100644 (file)
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -32,7 +32,7 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned long wdt_status;
@@ -139,7 +139,7 @@ static long iop_wdt_ioctl(struct file *file,
 
        switch (cmd) {
        case WDIOC_GETSUPPORT:
-               if (copy_to_user(argp, &ident, sizeof ident))
+               if (copy_to_user(argp, &ident, sizeof(ident)))
                        ret = -EFAULT;
                else
                        ret = 0;
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file)
                if (test_bit(WDT_ENABLED, &wdt_status))
                        state = wdt_disable();
 
-       /* if the timer is not disbaled reload and notify that we are still
+       /* if the timer is not disabled reload and notify that we are still
         * going down
         */
        if (state != 0) {
@@ -241,7 +241,7 @@ static int __init iop_wdt_init(void)
           with an open */
        ret = misc_register(&iop_wdt_miscdev);
        if (ret == 0)
-               printk("iop watchdog timer: timeout %lu sec\n",
+               printk(KERN_INFO "iop watchdog timer: timeout %lu sec\n",
                       iop_watchdog_timeout());
 
        return ret;