diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:59:26 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:59:26 +0000 |
| commit | e970f981c6ddead6b6bdd7bf30b2e8efe6246fc6 (patch) | |
| tree | ff00aff80cd62d8a81352e82e6e5d653ffa36275 /target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K | |
| parent | 23c01f8caa873f49a1658c4affeda1474cbb5b45 (diff) | |
| download | master-187ad058-e970f981c6ddead6b6bdd7bf30b2e8efe6246fc6.tar.gz master-187ad058-e970f981c6ddead6b6bdd7bf30b2e8efe6246fc6.tar.bz2 master-187ad058-e970f981c6ddead6b6bdd7bf30b2e8efe6246fc6.zip | |
kernel: update 4.1 to 4.1.2
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.2
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K')
| -rw-r--r-- | target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K b/target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K index d28fbc6081..c8aa336661 100644 --- a/target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K +++ b/target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K @@ -1,8 +1,6 @@ -Index: linux-4.1.1/drivers/mtd/spi-nor/spi-nor.c -=================================================================== ---- linux-4.1.1.orig/drivers/mtd/spi-nor/spi-nor.c -+++ linux-4.1.1/drivers/mtd/spi-nor/spi-nor.c -@@ -618,6 +618,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 +@@ -614,6 +614,7 @@ static const struct spi_device_id spi_no { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) }, { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, 0) }, |