diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-25 12:57:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-25 12:57:33 +0000 |
| commit | 671361c7ea8a260f414046317769d502aaf00d51 (patch) | |
| tree | 637d9699223fbb75ccd3de8dd0456ff2c97e7350 /target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch | |
| parent | 43d67fa995bb1b4073d345a08f23b25cf2ee62a1 (diff) | |
| download | upstream-671361c7ea8a260f414046317769d502aaf00d51.tar.gz upstream-671361c7ea8a260f414046317769d502aaf00d51.tar.bz2 upstream-671361c7ea8a260f414046317769d502aaf00d51.zip | |
adm5120: add 3.3 support
Partially based on the 3.1 patches by Hartmut Knaack <knaack.h [at] gmx.de>
SVN-Revision: 31474
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.patch | 21 |
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 0000000000..261aa79724 --- /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, + }; |