mac80211: enable build with linux 4.4

[librecmc/librecmc.git] / target / linux / lantiq / patches-3.18 / 0160-owrt-lantiq-multiple-flash.patch

diff --git a/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch b/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
index de0076a43331472033eab4736f3662f9e4779a76..c09323104d1bc859ceec9e7e72bc86329b35d8ae 100644 (file)
--- a/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
+++ b/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
@@ -8,7 +8,7 @@
  #include <linux/of.h>
  
  #include <lantiq_soc.h>
-@@ -38,10 +39,12 @@
+@@ -38,10 +39,12 @@ enum {
        LTQ_NOR_NORMAL
  };
  
@@ -24,7 +24,7 @@
  };
  
  static const char ltq_map_name[] = "ltq_nor";
-@@ -109,12 +112,44 @@
+@@ -109,12 +112,44 @@ ltq_copy_to(struct map_info *map, unsign
  }
  
  static int
@@ -70,7 +70,7 @@
  
        if (of_machine_is_compatible("lantiq,falcon") &&
                        (ltq_boot_select() != BS_FLASH)) {
-@@ -128,76 +163,88 @@
+@@ -128,76 +163,88 @@ ltq_mtd_probe(struct platform_device *pd
  
        platform_set_drvdata(pdev, ltq_mtd);
  
@@ -103,7 +103,7 @@
 +              else
 +                      ltq_mtd->map[i].phys = pdev->resource[i].start;
 +              ltq_mtd->map[i].size = resource_size(&pdev->resource[i]);
-+              ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, ltq_mtd->map[i].phys,
++              ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, pdev->resource[i].start,
 +                                               ltq_mtd->map[i].size);
 +              if (IS_ERR(ltq_mtd->map[i].virt))
 +                      return PTR_ERR(ltq_mtd->map[i].virt);