summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/drivers/watchdog
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-29 07:36:43 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-29 07:36:43 +0000
commit0c3e51f31ceb672b391aa4b4086ab5e0edf07fc1 (patch)
tree15e272500401e7847d9ea7dc40a0fafb81f93c1d /target/linux/adm5120/files/drivers/watchdog
parent71b94eaba41e5b7d038d3ad09a404316d9430ae5 (diff)
adm5120: merge 3.3 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/watchdog')
-rw-r--r--target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
index bf9056894..d5d63b27a 100644
--- a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
+++ b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
@@ -123,8 +123,7 @@ static ssize_t wdt_write(struct file *file, const char *data, size_t len, loff_t
return 0;
}
-static int wdt_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int new_timeout;
static struct watchdog_info ident = {
@@ -166,7 +165,7 @@ static const struct file_operations wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdt_write,
- .ioctl = wdt_ioctl,
+ .unlocked_ioctl = wdt_ioctl,
.open = wdt_open,
.release = wdt_release,
};