diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-15 00:42:41 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-15 00:42:41 +0100 |
| commit | bf4aa52dbf9f4ecb4e48f815e30357976605a12a (patch) | |
| tree | fa2accb7f67fc9a7cea76503138b4432f7791842 /target/linux/mvebu/patches-4.14 | |
| parent | 4943afd7818f56053231a5a7ae90e55da44f1f08 (diff) | |
| download | upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.tar.gz upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.tar.bz2 upstream-bf4aa52dbf9f4ecb4e48f815e30357976605a12a.zip | |
kernel: make mtd patches apply again
This makes some of the mtd patches apply again after some generic
patches were changed.
These problems where found by build bot.
Fixes: ac9bcefa3b044 ("kernel: use V10 of mtd patchset adding support for "compatible" string")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-4.14')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/100-find_active_root.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.14/100-find_active_root.patch b/target/linux/mvebu/patches-4.14/100-find_active_root.patch index 8a563474a7..f52a5108b8 100644 --- a/target/linux/mvebu/patches-4.14/100-find_active_root.patch +++ b/target/linux/mvebu/patches-4.14/100-find_active_root.patch @@ -11,10 +11,10 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> +static int mangled_rootblock; + - static int parse_ofpart_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) -@@ -33,6 +35,7 @@ static int parse_ofpart_partitions(struc + static int parse_fixed_partitions(struct mtd_info *master, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +@@ -33,6 +35,7 @@ static int parse_fixed_partitions(struct struct device_node *mtd_node; struct device_node *ofpart_node; const char *partname; @@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> struct device_node *pp; int nr_parts, i, ret = 0; bool dedicated = true; -@@ -110,9 +113,13 @@ static int parse_ofpart_partitions(struc +@@ -110,9 +113,13 @@ static int parse_fixed_partitions(struct parts[i].size = of_read_number(reg + a_cells, s_cells); parts[i].of_node = pp; |