diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:58:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:58:44 +0000 |
commit | 18748aea45fab91571285ad03b6a507deafad421 (patch) | |
tree | 19ec7cf9cf31f3a0c857938d94130d58b159cb3d /target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K | |
parent | 5da5af14ddffb02d4f181e92f240a7de7cca321c (diff) | |
download | master-187ad058-18748aea45fab91571285ad03b6a507deafad421.tar.gz master-187ad058-18748aea45fab91571285ad03b6a507deafad421.tar.bz2 master-187ad058-18748aea45fab91571285ad03b6a507deafad421.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46299 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K')
-rw-r--r-- | target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K b/target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K index 354bd7815f..d9831f4e71 100644 --- a/target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K +++ b/target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K @@ -1,8 +1,6 @@ -Index: linux-3.18.17/drivers/mtd/spi-nor/spi-nor.c -=================================================================== ---- linux-3.18.17.orig/drivers/mtd/spi-nor/spi-nor.c -+++ linux-3.18.17/drivers/mtd/spi-nor/spi-nor.c -@@ -570,6 +570,7 @@ static const struct spi_device_id spi_no +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -566,6 +566,7 @@ static const struct spi_device_id spi_no { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) }, { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, |