aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 10:43:09 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 13:03:23 +0200
commit548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch)
tree47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parent1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff)
downloadupstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip
kernel: bump 3.18 to 3.18.119
Refreshed all patches. Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r--target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index bca3487d18..b2b46ac6aa 100644
--- a/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1212,6 +1212,49 @@ static struct mtd_info * __init open_mtd
+@@ -1223,6 +1223,49 @@ static struct mtd_info * __init open_mtd
return mtd;
}
@@ -61,7 +61,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1301,6 +1344,12 @@ static int __init ubi_init(void)
+@@ -1312,6 +1355,12 @@ static int __init ubi_init(void)
}
}