projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: refresh patches on linux 3.18
[openwrt.git]
/
target
/
linux
/
bcm53xx
/
patches-3.18
/
004-mtd-spi-nor-from-3.20.patch
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
ab7b0bb
..
e2ef75e
100644
(file)
--- 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) },
/* PMC */
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
-@@ -89
5,6 +896
,45 @@ static int spansion_quad_enable(struct s
+@@ -89
6,6 +897
,45 @@ static int spansion_quad_enable(struct s
return 0;
}
return 0;
}
@@
-77,7
+77,7
@@
static int set_quad_mode(struct spi_nor *nor, struct flash_info *info)
{
int status;
static int set_quad_mode(struct spi_nor *nor, struct flash_info *info)
{
int status;
-@@ -90
7,6 +947
,13 @@ static int set_quad_mode(struct spi_nor
+@@ -90
8,6 +948
,13 @@ static int set_quad_mode(struct spi_nor
return -EINVAL;
}
return status;
return -EINVAL;
}
return status;