diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2018-05-12 23:12:32 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2018-05-12 23:14:07 +0200 |
| commit | 070693477a26a40fdf5de2316bc72073dc9930c1 (patch) | |
| tree | db8071cc5729875696f356c1da9b18cfe63cda71 /target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch | |
| parent | a3096b4b33dcc5fcc07b229346ef337aa5962019 (diff) | |
| download | upstream-070693477a26a40fdf5de2316bc72073dc9930c1.tar.gz upstream-070693477a26a40fdf5de2316bc72073dc9930c1.tar.bz2 upstream-070693477a26a40fdf5de2316bc72073dc9930c1.zip | |
kernel: backport mtd patch for minor partitioning cleanup
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch index 6379ff33fd..0e858d93bb 100644 --- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <linux/err.h> #include <linux/of.h> -@@ -864,6 +865,32 @@ void deregister_mtd_parser(struct mtd_pa +@@ -851,6 +852,32 @@ void deregister_mtd_parser(struct mtd_pa EXPORT_SYMBOL_GPL(deregister_mtd_parser); /* @@ -137,8 +137,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you * are changing this array! */ -@@ -1007,6 +1034,13 @@ int parse_mtd_partitions(struct mtd_info - { +@@ -991,6 +1018,13 @@ int parse_mtd_partitions(struct mtd_info + struct mtd_partitions pparts = { }; struct mtd_part_parser *parser; int ret, err = 0; + const char *const *types_of = NULL; @@ -151,7 +151,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> if (!types) types = default_mtd_part_types; -@@ -1043,6 +1077,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1031,6 +1065,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } |