projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update bcma and ssb to wireless-testing master-2014-12-05
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.14
/
490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
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
f97a442
..
67600ae
100644
(file)
--- 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
@@
-11,7
+11,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
--- 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;
}
return mtd;
}
@@
-60,7
+60,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static int __init ubi_init(void)
{
int err, i, k;
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1298,6 +1340,12 @@
+@@ -1298,6 +1340,12 @@
static int __init ubi_init(void)
}
}
}
}