kernel: bump 4.4 to 4.4.119

[openwrt/staging/hauke.git] / target / linux / brcm63xx / patches-4.4 / 000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch

diff --git a/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch b/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
index 8a031301b10a31d44cbf2b84dac03a77de81bb28..3dc68f01dfc9da698c1878531937bffaa2f57c30 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
+++ b/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
@@ -83,7 +83,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  
 --- a/drivers/mtd/nand/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
-@@ -1946,7 +1946,6 @@ static int brcmnand_init_cs(struct brcmn
+@@ -1939,7 +1939,6 @@ static int brcmnand_init_cs(struct brcmn
        struct nand_chip *chip;
        int ret;
        u16 cfg_offs;
@@ -91,7 +91,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  
        ret = of_property_read_u32(dn, "reg", &host->cs);
        if (ret) {
-@@ -2025,7 +2024,7 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2018,7 +2017,7 @@ static int brcmnand_init_cs(struct brcmn
        if (nand_scan_tail(mtd))
                return -ENXIO;
  
@@ -610,7 +610,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  
        flctl = devm_kzalloc(&pdev->dev, sizeof(struct sh_flctl), GFP_KERNEL);
        if (!flctl)
-@@ -1123,6 +1122,7 @@ static int flctl_probe(struct platform_d
+@@ -1124,6 +1123,7 @@ static int flctl_probe(struct platform_d
        platform_set_drvdata(pdev, flctl);
        flctl_mtd = &flctl->mtd;
        nand = &flctl->chip;
@@ -618,7 +618,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
        flctl_mtd->priv = nand;
        flctl_mtd->dev.parent = &pdev->dev;
        flctl->pdev = pdev;
-@@ -1163,9 +1163,7 @@ static int flctl_probe(struct platform_d
+@@ -1164,9 +1164,7 @@ static int flctl_probe(struct platform_d
        if (ret)
                goto err_chip;
  
@@ -662,7 +662,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  
 --- a/drivers/mtd/nand/sunxi_nand.c
 +++ b/drivers/mtd/nand/sunxi_nand.c
-@@ -1232,7 +1232,6 @@ static int sunxi_nand_chip_init(struct d
+@@ -1238,7 +1238,6 @@ static int sunxi_nand_chip_init(struct d
  {
        const struct nand_sdr_timings *timings;
        struct sunxi_nand_chip *chip;
@@ -670,7 +670,7 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
        struct mtd_info *mtd;
        struct nand_chip *nand;
        int nsels;
-@@ -1366,8 +1365,7 @@ static int sunxi_nand_chip_init(struct d
+@@ -1372,8 +1371,7 @@ static int sunxi_nand_chip_init(struct d
                return ret;
        }