kernel: refresh patches

[openwrt/staging/mkresin.git] / target / linux / lantiq / patches-3.14 / 0021-MTD-lantiq-Makes-the-Lantiq-flash-driver-try-jedec-p.patch

diff --git a/target/linux/lantiq/patches-3.14/0021-MTD-lantiq-Makes-the-Lantiq-flash-driver-try-jedec-p.patch b/target/linux/lantiq/patches-3.14/0021-MTD-lantiq-Makes-the-Lantiq-flash-driver-try-jedec-p.patch
index 00a2c8e1d3592fc07a12201941c29a0d2ac75421..33c3616ea515866cbd932c05f9bc372e3096bfd8 100644 (file)
--- a/target/linux/lantiq/patches-3.14/0021-MTD-lantiq-Makes-the-Lantiq-flash-driver-try-jedec-p.patch
+++ b/target/linux/lantiq/patches-3.14/0021-MTD-lantiq-Makes-the-Lantiq-flash-driver-try-jedec-p.patch
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  drivers/mtd/maps/lantiq-flash.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
-index 710d699..dd1e853 100644
 --- a/drivers/mtd/maps/lantiq-flash.c
 +++ b/drivers/mtd/maps/lantiq-flash.c
-@@ -117,6 +117,11 @@ ltq_mtd_probe(struct platform_device *pdev)
+@@ -117,6 +117,11 @@ ltq_mtd_probe(struct platform_device *pd
        struct cfi_private *cfi;
        int err;
  
@@ -29,7 +27,7 @@ index 710d699..dd1e853 100644
        if (of_machine_is_compatible("lantiq,falcon") &&
                        (ltq_boot_select() != BS_FLASH)) {
                dev_err(&pdev->dev, "invalid bootstrap options\n");
-@@ -158,7 +163,10 @@ ltq_mtd_probe(struct platform_device *pdev)
+@@ -158,7 +163,10 @@ ltq_mtd_probe(struct platform_device *pd
        ltq_mtd->map->copy_to = ltq_copy_to;
  
        ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING;
@@ -41,6 +39,3 @@ index 710d699..dd1e853 100644
        ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL;
  
        if (!ltq_mtd->mtd) {
--- 
-1.7.10.4
-