kernel: update 4.1 to 4.1.5

[openwrt/openwrt.git] / target / linux / sunxi / patches-4.1 / 120-mtd-nand-print-ecc-strength.patch

diff --git a/target/linux/sunxi/patches-4.1/120-mtd-nand-print-ecc-strength.patch b/target/linux/sunxi/patches-4.1/120-mtd-nand-print-ecc-strength.patch
index a150cbf2eb6c40d2235036bab8ffc2ff2631d39f..186ce2ea9976b3a77f9d7d95882f5763c5cfa451 100644 (file)
--- a/target/linux/sunxi/patches-4.1/120-mtd-nand-print-ecc-strength.patch
+++ b/target/linux/sunxi/patches-4.1/120-mtd-nand-print-ecc-strength.patch
@@ -11,11 +11,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  drivers/mtd/nand/nand_base.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index e3d4d8e..5c6f465 100644
 --- a/drivers/mtd/nand/nand_base.c
 +++ b/drivers/mtd/nand/nand_base.c
-@@ -4437,9 +4437,11 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+@@ -4437,9 +4437,11 @@ ident_done:
                pr_info("%s %s\n", nand_manuf_ids[maf_idx].name,
                                type->name);