kernel: bump 5.10 to 5.10.95

[openwrt/staging/mkresin.git] / target / linux / pistachio / patches-5.10 / 401-mtd-nor-support-mtd-name-from-device-tree.patch

diff --git a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index b85ecef38376ad481e7660af3fc5d724c0ee4d32..3beca822b58dbf9a5dc1407488176ee9fbc719cc 100644 (file)
--- a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -3189,6 +3189,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3147,6 +3147,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;
  
-@@ -3243,7 +3244,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3201,7 +3202,12 @@ int spi_nor_scan(struct spi_nor *nor, co
        if (ret)
                return ret;