kernel: make mtd patches apply again

[openwrt/staging/chunkeey.git] / target / linux / lantiq / patches-4.9 / 0101-find_active_root.patch

diff --git a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch b/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
index 7232ffa416963a5147792090c8323df59ac658ac..73361c87faba0fbc1b8180a85dacfcdcbc9b8c08 100644 (file)
--- a/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
+++ b/target/linux/lantiq/patches-4.9/0101-find_active_root.patch
@@ -36,10 +36,10 @@
 +      }
 +}
 +
- static int parse_ofpart_partitions(struct mtd_info *master,
-                                  const struct mtd_partition **pparts,
-                                  struct mtd_part_parser_data *data)
-@@ -36,7 +68,8 @@ 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)
+@@ -36,7 +68,8 @@ static int parse_fixed_partitions(struct
        struct device_node *pp;
        int nr_parts, i, ret = 0;
        bool dedicated = true;
@@ -49,7 +49,7 @@
  
        /* Pull of_node from the master device node */
        mtd_node = mtd_get_of_node(master);
-@@ -72,7 +105,9 @@ static int parse_ofpart_partitions(struc
+@@ -72,7 +105,9 @@ static int parse_fixed_partitions(struct
                return 0;
  
        parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
@@ -60,7 +60,7 @@
                return -ENOMEM;
  
        i = 0;
-@@ -121,12 +156,22 @@ static int parse_ofpart_partitions(struc
+@@ -121,12 +156,22 @@ static int parse_fixed_partitions(struct
                if (of_get_property(pp, "lock", &len))
                        parts[i].mask_flags |= MTD_POWERUP_LOCK;