aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 13:53:03 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-14 16:27:43 +0100
commit7e20e4ab96ffc4d425fc3c6593a65d813f641fd1 (patch)
treee5a8922efcd5dbceda05164f7736e2d89f6aeb49 /target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
parentf7a406deafb4d2524f46a405d84a6d20c65022a9 (diff)
downloadupstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.gz
upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.bz2
upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.zip
kernel: bump 4.9 to 4.9.137
Refreshed all patches. Removed upstreamed hunks in: - 703-phy-support-layerscape.patch Compile-tested on: ar71xx, layerscape Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch')
-rw-r--r--target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch b/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
index dc05fe31bb..1d507c1920 100644
--- a/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
+++ b/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch
@@ -116,7 +116,7 @@ Acked-by: Marek Vasut <marek.vasut@gmail.com>
/* Enable/disable 4-byte addressing mode. */
static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
int enable)
-@@ -1628,27 +1704,10 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1634,27 +1710,10 @@ int spi_nor_scan(struct spi_nor *nor, co
else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;