aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.4
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-04-16 21:05:48 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-04-16 21:05:48 +0000
commitf0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b (patch)
treec39e3a477111f347c5ab70ad4246ce8121797d32 /target/linux/ramips/patches-4.4
parent1414f1647d435a7eda48d9433a022286a46d9097 (diff)
downloadupstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.tar.gz
upstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.tar.bz2
upstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.zip
kernel: update kernel 4.4 to version 4.4.7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49176
Diffstat (limited to 'target/linux/ramips/patches-4.4')
-rw-r--r--target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
index 227cc96099..9821dac322 100644
--- a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
+++ b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1011,6 +1011,66 @@ write_err:
+@@ -1008,6 +1008,66 @@ write_err:
return ret;
}
@@ -67,7 +67,7 @@
static int macronix_quad_enable(struct spi_nor *nor)
{
int ret, val;
-@@ -1232,10 +1292,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1229,10 +1289,12 @@ int spi_nor_scan(struct spi_nor *nor, co
}
/* sst nor chips use AAI word program */
@@ -82,7 +82,7 @@
if (info->flags & USE_FSR)
nor->flags |= SNOR_F_USE_FSR;
-@@ -1263,11 +1325,20 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1260,11 +1322,20 @@ int spi_nor_scan(struct spi_nor *nor, co
mtd->writebufsize = nor->page_size;
if (np) {