aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:58:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:58:44 +0000
commit58b66cdd75bc9b24acddcbccb46e8bfed4426c96 (patch)
treee4bf2c21711f0175e4d1e74ade4f7cd8319f7d1f /target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
parent05ae45ac6fa2b8a090b2854ba72ef490bf2584ff (diff)
downloadupstream-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.gz
upstream-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.bz2
upstream-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.zip
kernel: update 3.18 to 3.18.18
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46299
Diffstat (limited to 'target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch')
-rw-r--r--target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
index 6bf516c71b..dca6895c14 100644
--- a/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
+++ b/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -616,6 +616,7 @@ static const struct spi_device_id spi_no
+@@ -617,6 +617,7 @@ static const struct spi_device_id spi_no
{ "m25px80", INFO(0x207114, 0, 64 * 1024, 16, 0) },
/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */