aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
commitf45b1a671a2bfb4b74a0a45f49723a78d270764b (patch)
treedf2cea987db125da27fe150e04929430b17624a3 /target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parent089f09592693276db9735d76640986fad9be7ade (diff)
downloadupstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.tar.gz
upstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.tar.bz2
upstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.zip
kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41150
Diffstat (limited to 'target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r--target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 440c6bf050..ed83666661 100644
--- a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
-diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
-index 6e30a3c..999a36b 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd_device(const char *mtd_dev)
+@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd
return mtd;
}
@@ -63,6 +61,3 @@ index 6e30a3c..999a36b 100644
err = ubiblock_init();
if (err) {
ubi_err("block: cannot initialize, error %d", err);
---
-1.9.2
-