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:
authorHauke Mehrtens <hauke@openwrt.org>2014-12-07 16:12:44 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-12-07 16:12:44 +0000
commitecc2fb197c819bdf1b6c7748364c02152601d99e (patch)
treec30364bea3c907947b4124998f5ca96653d33a05 /target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
parent5b0c81ab74b76a53f58a53a6048747fb63a6abcb (diff)
downloadmaster-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.tar.gz
master-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.tar.bz2
master-187ad058-ecc2fb197c819bdf1b6c7748364c02152601d99e.zip
kernel: refresh patches for kernel 3.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43536 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 f97a442cb1..67600ae972 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,48 @@
+@@ -1209,6 +1209,48 @@ static struct mtd_info * __init open_mtd
return mtd;
}
@@ -60,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1298,6 +1340,12 @@
+@@ -1298,6 +1340,12 @@ static int __init ubi_init(void)
}
}