diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-05-22 14:16:12 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-22 20:49:08 +0200 |
| commit | faf0a460c4b8d77bed270156a4454b964a551c95 (patch) | |
| tree | ced6881afd2284e2ed83188d0ee96a2671f4ec6b /target/linux/pistachio/patches-4.14 | |
| parent | 6c5f2d73e9344bc1b51442825cbc11e67b007ad3 (diff) | |
| download | upstream-faf0a460c4b8d77bed270156a4454b964a551c95.tar.gz upstream-faf0a460c4b8d77bed270156a4454b964a551c95.tar.bz2 upstream-faf0a460c4b8d77bed270156a4454b964a551c95.zip | |
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 <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.patch | 4 |
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..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 <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 +@@ -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 <Abhimanyu.Vishwakarma@imgtec.com> 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); } |