aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-12 13:47:16 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-12 13:47:16 +0000
commit29039f51b3c6707f903018b53785409bf97f5fe0 (patch)
tree67a0a31f9ef48cc65ab38d2c65f2e7ccdcadf3b5 /target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
parentfde2caf6fdd229039b9a75037f9f73d76bc041e2 (diff)
downloadupstream-29039f51b3c6707f903018b53785409bf97f5fe0.tar.gz
upstream-29039f51b3c6707f903018b53785409bf97f5fe0.tar.bz2
upstream-29039f51b3c6707f903018b53785409bf97f5fe0.zip
kernel: refresh patches on linux 3.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46308
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
index ab7b0bb573..e2ef75e3dc 100644
--- a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
+++ b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
@@ -31,7 +31,7 @@
/* PMC */
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
-@@ -895,6 +896,45 @@ static int spansion_quad_enable(struct s
+@@ -896,6 +897,45 @@ static int spansion_quad_enable(struct s
return 0;
}
@@ -77,7 +77,7 @@
static int set_quad_mode(struct spi_nor *nor, struct flash_info *info)
{
int status;
-@@ -907,6 +947,13 @@ static int set_quad_mode(struct spi_nor
+@@ -908,6 +948,13 @@ static int set_quad_mode(struct spi_nor
return -EINVAL;
}
return status;