projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CC: upgrade kernel to 3.18.68
[15.05/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
1238785
..
3172e99
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
@@
-23,7
+23,7
@@
/* PMC */
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
/* PMC */
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
-@@ -
896,6 +896
,45 @@ static int spansion_quad_enable(struct s
+@@ -
903,6 +903
,45 @@ static int spansion_quad_enable(struct s
return 0;
}
return 0;
}
@@
-69,7
+69,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;
-@@ -9
08,6 +947
,13 @@ static int set_quad_mode(struct spi_nor
+@@ -9
15,6 +954
,13 @@ static int set_quad_mode(struct spi_nor
return -EINVAL;
}
return status;
return -EINVAL;
}
return status;