aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-10-14 11:32:48 +0000
committerJohn Crispin <john@openwrt.org>2014-10-14 11:32:48 +0000
commitcc292d7de8c79efa01a9dd69ccd8e3115aa7550c (patch)
treec3772917814ad19a88229d71f785a8bf8b72dbf6 /target/linux/generic
parentaf58224462ba563edd5606139779716986bb0412 (diff)
downloadupstream-cc292d7de8c79efa01a9dd69ccd8e3115aa7550c.tar.gz
upstream-cc292d7de8c79efa01a9dd69ccd8e3115aa7550c.tar.bz2
upstream-cc292d7de8c79efa01a9dd69ccd8e3115aa7550c.zip
generic: fix yaffs compilation on 3.14
Signed-off-by: Roman Yeryomin <roman@advem.lv> SVN-Revision: 42909
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch12
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch b/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
index 5a15b516b5..88531a6a7b 100644
--- a/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
+++ b/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
@@ -80,7 +80,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
if (options.lazy_loading_overridden)
--- a/fs/yaffs2/yaffs_mtdif.c
+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -276,7 +276,8 @@ struct mtd_info * yaffs_get_mtd_device(d
+@@ -16,6 +16,7 @@
+ #include "yaffs_mtdif.h"
+
+ #include "linux/mtd/mtd.h"
++#include "uapi/linux/major.h"
+ #include "linux/types.h"
+ #include "linux/time.h"
+ #include "linux/mtd/nand.h"
+@@ -277,7 +277,8 @@ struct mtd_info * yaffs_get_mtd_device(d
return mtd;
}
@@ -90,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
{
if (yaffs_version == 2) {
if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-@@ -295,6 +296,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
+@@ -296,6 +297,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
);
return -1;
}