diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 9157f620436a8383b13c30c0a26ad06b976b1a0b (patch) | |
tree | 768c585c31df15ffc89cd03480ce4558ea291ca0 /target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch | |
parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
download | upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45711 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch b/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch index b13a6fb391..815097949e 100644 --- a/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch +++ b/target/linux/bcm53xx/patches-3.18/003-mtd-spi-nor-from-3.19.patch @@ -234,7 +234,7 @@ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE); instr->state = MTD_ERASE_DONE; -@@ -341,11 +380,6 @@ static int spi_nor_lock(struct mtd_info +@@ -341,11 +380,6 @@ static int spi_nor_lock(struct mtd_info if (ret) return ret; @@ -510,7 +510,7 @@ case CFI_MFR_MACRONIX: status = macronix_quad_enable(nor); if (status) { -@@ -909,11 +925,6 @@ static int spi_nor_check(struct spi_nor +@@ -909,11 +925,6 @@ static int spi_nor_check(struct spi_nor return -EINVAL; } |