aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-10-26 15:33:07 +0200
committerGitHub <noreply@github.com>2016-10-26 15:33:07 +0200
commit1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch)
tree1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parent2aefb514a4852f4c427b467150bbc7cdfe024528 (diff)
parent2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff)
downloadupstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.gz
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.bz2
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.zip
Merge pull request #151 from wigyori/cc-dirtycow
CC: generic: bump kernel to 3.18.44
Diffstat (limited to 'target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r--target/linux/generic/patches-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/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index d7b20b81f5..bca3487d18 100644
--- a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/patches-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
-@@ -1209,6 +1209,49 @@ static struct mtd_info * __init open_mtd
+@@ -1212,6 +1212,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;
-@@ -1298,6 +1341,12 @@ static int __init ubi_init(void)
+@@ -1301,6 +1344,12 @@ static int __init ubi_init(void)
}
}