diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 09:44:24 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 09:44:24 +0000 |
| commit | 71a03fb16860e6f94d1f58c0754e74486c8167b2 (patch) | |
| tree | 2448fb6a3c073be1743a20a3ad8c969dd8f5d6bc /target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch | |
| parent | 8e525a43b45f4bd4f88a438880f416285e23b0be (diff) | |
| download | mtk-20170518-71a03fb16860e6f94d1f58c0754e74486c8167b2.zip mtk-20170518-71a03fb16860e6f94d1f58c0754e74486c8167b2.tar.gz mtk-20170518-71a03fb16860e6f94d1f58c0754e74486c8167b2.tar.bz2 | |
kernel: merge two mtdpart.c patches
It does not make sense to add some code and remove is 4 patches later.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42673
Diffstat (limited to 'target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch index 9addb8b..a434f6e 100644 --- a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch +++ b/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -824,6 +824,30 @@ static struct mtd_part_parser *get_parti +@@ -798,6 +798,30 @@ static struct mtd_part_parser *get_parti #define put_partition_parser(p) do { module_put((p)->owner); } while (0) @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> void register_mtd_parser(struct mtd_part_parser *p) { spin_lock(&part_parser_lock); -@@ -897,6 +921,38 @@ int parse_mtd_partitions(struct mtd_info +@@ -871,6 +895,38 @@ int parse_mtd_partitions(struct mtd_info return ret; } |