diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-11 19:58:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-11 19:58:44 +0000 |
| commit | 58b66cdd75bc9b24acddcbccb46e8bfed4426c96 (patch) | |
| tree | e4bf2c21711f0175e4d1e74ade4f7cd8319f7d1f /target/linux/generic/patches-3.18/091-mtd-spi-nor-add-support-Spansion_S25FL164K | |
| parent | 05ae45ac6fa2b8a090b2854ba72ef490bf2584ff (diff) | |
| download | master-31e0f0ae-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.gz master-31e0f0ae-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.bz2 master-31e0f0ae-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/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) }, |