diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 10:47:18 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 11:40:05 +0200 |
| commit | 4d5f296af857ecbd3916d1d156d1bc63c998995a (patch) | |
| tree | ac9c9dac59054e607ad4c357bb2edc01669b5937 /target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch | |
| parent | 8c1e760ab60994de26d2a2c85f91e86192999dfb (diff) | |
| download | upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.tar.gz upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.tar.bz2 upstream-4d5f296af857ecbd3916d1d156d1bc63c998995a.zip | |
kernel: backport upstream mtd support for partition parsers
In a log term it should replace our implementation. For now both can
coexist.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
| -rw-r--r-- | target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch index 8bca58a31e..41609d5aae 100644 --- a/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -116,7 +116,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <linux/err.h> #include "mtdcore.h" -@@ -815,6 +816,42 @@ void deregister_mtd_parser(struct mtd_pa +@@ -855,6 +856,42 @@ void deregister_mtd_parser(struct mtd_pa EXPORT_SYMBOL_GPL(deregister_mtd_parser); /* @@ -159,7 +159,7 @@ 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! */ -@@ -872,6 +909,13 @@ int parse_mtd_partitions(struct mtd_info +@@ -912,6 +949,13 @@ int parse_mtd_partitions(struct mtd_info { struct mtd_part_parser *parser; int ret, err = 0; @@ -173,7 +173,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> if (!types) types = default_mtd_part_types; -@@ -897,6 +941,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -937,6 +981,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } |