aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-09-29 15:49:20 +0200
committerGitHub <noreply@github.com>2016-09-29 15:49:20 +0200
commitca3f1a614a1ee90fc67188b375888517f0c151df (patch)
tree930c456200793be1ec731e819aa0dd2e4b0b0dbf /target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch
parentd6b3ca24c50047af58135ad3090f7a3a25eee35d (diff)
parentf9755e28776fdce0c2136492b43380d0eefe3c5a (diff)
downloadupstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.gz
upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.bz2
upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.zip
Merge pull request #105 from wigyori/chaos_calmer
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer
Diffstat (limited to 'target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch')
-rw-r--r--target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch
index cd02c13e0c..4b5eb4568d 100644
--- a/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch
+++ b/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch
@@ -41,7 +41,7 @@
break;
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
-@@ -701,6 +701,7 @@ struct ubi_attach_info {
+@@ -705,6 +705,7 @@ struct ubi_attach_info {
int mean_ec;
uint64_t ec_sum;
int ec_count;