[WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs

[linux-2.6] / drivers / watchdog / pcwd_pci.c

diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 61a89e9596421376d2047686f7177e32b073ca41..67d90810c6e95542c187089d92f584773b6179f1 100644 (file)
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -46,9 +46,8 @@
 #include <linux/pci.h>         /* For pci functions */
 #include <linux/ioport.h>      /* For io-port access */
 #include <linux/spinlock.h>    /* For spin_lock/spin_unlock/... */
-
-#include <asm/uaccess.h>       /* For copy_to_user/put_user/... */
-#include <asm/io.h>            /* For inb/outb/... */
+#include <linux/uaccess.h>     /* For copy_to_user/put_user/... */
+#include <linux/io.h>          /* For inb/outb/... */
 
 /* Module and version information */
 #define WATCHDOG_VERSION "1.03"
@@ -455,8 +454,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data,
        return len;
 }
 
-static int pcipcwd_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
+static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
+                                               unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
@@ -478,9 +477,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,
                case WDIOC_GETSTATUS:
                {
                        int status;
-
                        pcipcwd_get_status(&status);
-
                        return put_user(status, p);
                }
 
@@ -644,7 +641,7 @@ static const struct file_operations pcipcwd_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .write =        pcipcwd_write,
-       .ioctl =        pcipcwd_ioctl,
+       .unlocked_ioctl = pcipcwd_ioctl,
        .open =         pcipcwd_open,
        .release =      pcipcwd_release,
 };