kernel: make mtd patches apply again

[openwrt/staging/chunkeey.git] / target / linux / mvebu / patches-4.14 / 100-find_active_root.patch

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 8a563474a7a6a8a25e6123ad176b097afb90cdce..f52a5108b852ba9e6f7a0f5e5c77290763230f62 100644 (file)
--- 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;