From 0c3e51f31ceb672b391aa4b4086ab5e0edf07fc1 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 29 Apr 2012 07:36:43 +0000 Subject: adm5120: merge 3.3 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31511 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.3/a11-adm5120_wdt-3.3-fixes.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch (limited to 'target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch') 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 deleted file mode 100644 index 261aa7972..000000000 --- a/target/linux/adm5120/patches-3.3/a11-adm5120_wdt-3.3-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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, - }; -- cgit v1.2.3