From faf0a460c4b8d77bed270156a4454b964a551c95 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 22 May 2018 14:16:12 +0200 Subject: kernel: bump 4.14 to 4.14.42 Refreshed all patches Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte --- .../patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/pistachio/patches-4.14') diff --git a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch index eeb1e4dee8..60474ceae0 100644 --- a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma --- 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 +@@ -2651,6 +2651,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 int ret; int i; -@@ -2725,7 +2726,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2726,7 +2727,12 @@ int spi_nor_scan(struct spi_nor *nor, co spi_nor_wait_till_ready(nor); } -- cgit v1.2.3