diff options
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 72e2524c97..44565c6467 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch index 6123ec1105..751a9bcd0c 100644 --- a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch +++ b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/mtd/devices/m25p80.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) -Index: linux-3.10.34/drivers/mtd/devices/m25p80.c -=================================================================== ---- linux-3.10.34.orig/drivers/mtd/devices/m25p80.c 2014-03-30 19:40:10.135292951 +0100 -+++ linux-3.10.34/drivers/mtd/devices/m25p80.c 2014-03-30 19:44:40.151295482 +0100 -@@ -392,6 +392,58 @@ +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -392,6 +392,58 @@ static int m25p80_read(struct mtd_info * return 0; } @@ -71,7 +69,7 @@ Index: linux-3.10.34/drivers/mtd/devices/m25p80.c /* * Write an address range to the flash chip. Data must be written in * FLASH_PAGESIZE chunks. The address range may be any size provided -@@ -479,6 +531,76 @@ +@@ -479,6 +531,76 @@ static int m25p80_write(struct mtd_info return 0; } @@ -148,7 +146,7 @@ Index: linux-3.10.34/drivers/mtd/devices/m25p80.c static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1058,6 +1180,12 @@ +@@ -1058,6 +1180,12 @@ static int m25p_probe(struct spi_device flash->fast_read = true; #endif |