aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:07 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-04-12 11:59:07 +0000
commit0e6867db1e9a2feb6ded27a33631e25f6c18e11e (patch)
tree5689460cf1b5a04c4b83e21e9e627d528f393cd9 /target/linux/ramips/patches-3.10
parent9aa3da569edfc91995fbb4bf030d40cce3f0b45e (diff)
downloadupstream-0e6867db1e9a2feb6ded27a33631e25f6c18e11e.tar.gz
upstream-0e6867db1e9a2feb6ded27a33631e25f6c18e11e.tar.bz2
upstream-0e6867db1e9a2feb6ded27a33631e25f6c18e11e.zip
kernel: update 3.10 to 3.10.36
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40467 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.10')
-rw-r--r--target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch12
1 files changed, 5 insertions, 7 deletions
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