summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/files/drivers/watchdog
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-21 18:42:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-21 18:42:11 +0000
commit8858d90afe5a6747f3b96c369a1a64ad25f4d0ad (patch)
tree9dc1bba9937f5957c0b3fbe3f3662306088d3208 /target/linux/ar71xx/files/drivers/watchdog
parent0ee2fda5e1f6aa62cc401853aead1468ca991eb7 (diff)
downloadmtk-20170518-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.zip
mtk-20170518-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.tar.gz
mtk-20170518-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.tar.bz2
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
SVN-Revision: 23574
Diffstat (limited to 'target/linux/ar71xx/files/drivers/watchdog')
-rw-r--r--target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
index b5bc254..5f8104b 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,
};