kernel: bump 4.14 to 4.14.91
[openwrt/staging/chunkeey.git] / target / linux / pistachio / patches-4.14 / 401-mtd-nor-support-mtd-name-from-device-tree.patch
index eeb1e4dee88e5cfae7affa18b6b6175ba0aeb1f0..d5f9627fac1ae1c5b24142bc06702720797c7d7d 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2650,6 +2650,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2663,6 +2663,7 @@ int spi_nor_scan(struct spi_nor *nor, co
        struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
        int ret;
        int i;
  
-@@ -2725,7 +2726,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2738,7 +2739,12 @@ int spi_nor_scan(struct spi_nor *nor, co
                spi_nor_wait_till_ready(nor);
        }