From 0a95e857aa89d4a52df301b068202db449abec41 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Oct 2010 18:42:11 +0000 Subject: ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch to the 2.6.36 patches, add a backport patch to 2.6.32 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23574 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ar71xx/files/drivers/watchdog') diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c index b5bc254f8..5f8104bcd 100644 --- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c +++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c @@ -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, }; -- cgit v1.2.3