projects
/
openwrt
/
staging
/
mkresin.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.206
[openwrt/staging/mkresin.git]
/
target
/
linux
/
generic
/
backport-4.9
/
065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
diff --git
a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
index d312e081a9d4f7884aac396d9506ef47f0a748b9..70c1462d3fb743508ae55d245d9d58fc86a45c49 100644
(file)
--- a/
target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
+++ b/
target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch
@@
-18,7
+18,7
@@
Acked-by: Brian Norris <computersforpeace@gmail.com>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -8
07,6 +807
,27 @@ static const char * const default_mtd_pa
+@@ -8
32,6 +832
,27 @@ static const char * const default_mtd_pa
NULL
};
NULL
};
@@
-46,7
+46,7
@@
Acked-by: Brian Norris <computersforpeace@gmail.com>
/**
* parse_mtd_partitions - parse MTD partitions
* @master: the master partition (describes whole MTD device)
/**
* parse_mtd_partitions - parse MTD partitions
* @master: the master partition (describes whole MTD device)
-@@ -8
47,16 +868
,10 @@ int parse_mtd_partitions(struct mtd_info
+@@ -8
72,16 +893
,10 @@ int parse_mtd_partitions(struct mtd_info
parser ? parser->name : NULL);
if (!parser)
continue;
parser ? parser->name : NULL);
if (!parser)
continue;