projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.96
[openwrt/staging/wigyori.git]
/
target
/
linux
/
generic
/
pending-4.9
/
490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
diff --git
a/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
b/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 76d031002e216fbe1308b8498b252506d243cd68..1d44cdb9f40b9ac64f46d6b6b1103487c5160a6f 100644
(file)
--- a/
target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/
target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@
-8,7
+8,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
-@@ -12
12,6 +1212
,49 @@ static struct mtd_info * __init open_mtd
+@@ -12
23,6 +1223
,49 @@ static struct mtd_info * __init open_mtd
return mtd;
}
return mtd;
}
@@
-58,7
+58,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;
-@@ -1
295,6 +1338
,12 @@ static int __init ubi_init(void)
+@@ -1
306,6 +1349
,12 @@ static int __init ubi_init(void)
}
}
}
}