aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 11:23:17 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 16:00:47 +0100
commitf9c79947b5c4e726ecf5afd1b04d99f0b4101755 (patch)
tree6fc4416f0f7d900b899407a3e16d68794b8bc20c /target/linux/pistachio/patches-4.14
parent91a8bc1dd06719e9edd3ab0791f5a0f11af836cd (diff)
downloadupstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.tar.gz
upstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.tar.bz2
upstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.zip
kernel: bump 4.14 to 4.14.79
Refreshed all patches. Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/pistachio/patches-4.14')
-rw-r--r--target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch4
1 files changed, 2 insertions, 2 deletions
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..47b6b17769 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 <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
+@@ -2656,6 +2656,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
+@@ -2731,7 +2732,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}