summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-25 12:57:33 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-25 12:57:33 +0000
commit05735d303b93c2a1050ef515e8c67e393ae3987f (patch)
tree2a4d205fd4cde0b74a467cf30081e0ab4c627ba9 /target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch
parent0e8ddda2ee6ce7ba23b4a92b4c01e01aa424050b (diff)
adm5120: add 3.3 support
Partially based on the 3.1 patches by Hartmut Knaack <knaack.h [at] gmx.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31474 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch')
-rw-r--r--target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch b/target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch
new file mode 100644
index 000000000..261aa7972
--- /dev/null
+++ b/target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch
@@ -0,0 +1,21 @@
+--- a/drivers/watchdog/adm5120_wdt.c
++++ b/drivers/watchdog/adm5120_wdt.c
+@@ -123,8 +123,7 @@ static ssize_t wdt_write(struct file *fi
+ 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_
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .write = wdt_write,
+- .ioctl = wdt_ioctl,
++ .unlocked_ioctl = wdt_ioctl,
+ .open = wdt_open,
+ .release = wdt_release,
+ };