aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commitdcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
parent59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff)
downloadmaster-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch')
-rw-r--r--target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch b/target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
index fa261ce648..93ac939502 100644
--- a/target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
+++ b/target/linux/generic/patches-3.6/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
@@ -17,7 +17,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
-@@ -233,7 +233,8 @@ static long mpcore_wdt_ioctl(struct file
+@@ -236,7 +236,8 @@ static long mpcore_wdt_ioctl(struct file
if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
return -ENOTTY;