aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.4
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-04-16 21:05:48 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-04-16 21:05:48 +0000
commitd100e7268dc869ede6c06ba0a4af0a1408dd96ae (patch)
tree59d0867372146091498ebd7ca19fe9fded286009 /target/linux/ramips/patches-4.4
parent8b1c96219388dda929244b33278a28498ca83e66 (diff)
downloadmaster-187ad058-d100e7268dc869ede6c06ba0a4af0a1408dd96ae.tar.gz
master-187ad058-d100e7268dc869ede6c06ba0a4af0a1408dd96ae.tar.bz2
master-187ad058-d100e7268dc869ede6c06ba0a4af0a1408dd96ae.zip
kernel: update kernel 4.4 to version 4.4.7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49176 3c298f89-4303-0410-b956-a3cf2f4a3e73
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) {