ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch...
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / watchdog / ar71xx_wdt.c
index b5bc254f8b238c343b13b23a01f64d3eae2c0498..5f8104bcdf15f4d5bda08ad0ce437c577ca9080c 100644 (file)
@@ -146,7 +146,7 @@ static struct watchdog_info ar71xx_wdt_info = {
        .identity               = "AR71XX watchdog",
 };
 
-static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file,
+static long ar71xx_wdt_ioctl(struct file *file,
                            unsigned int cmd, unsigned long arg)
 {
        int t;
@@ -197,7 +197,7 @@ static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file,
 static const struct file_operations ar71xx_wdt_fops = {
        .owner          = THIS_MODULE,
        .write          = ar71xx_wdt_write,
-       .ioctl          = ar71xx_wdt_ioctl,
+       .unlocked_ioctl = ar71xx_wdt_ioctl,
        .open           = ar71xx_wdt_open,
        .release        = ar71xx_wdt_release,
 };