aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 11:22:43 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 16:00:00 +0100
commitc764b2b531116d0bf7d285ac8fee29eea6a486cc (patch)
tree7ebfe1d3820173b4d11067fd30d5a911011eb73f /target/linux/pistachio/patches-4.14
parent69734416d23d97c1e58c2cc1fcef535ce0c9ae13 (diff)
downloadupstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.tar.gz
upstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.tar.bz2
upstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.zip
kernel: bump 4.14 to 4.14.79
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, 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 47b6b17769..16cfa211a7 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
-@@ -2656,6 +2656,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2662,6 +2662,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;
-@@ -2731,7 +2732,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2737,7 +2738,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}