projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #536 from wigyori/cc-sec
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
462-m25p80-mx-disable-software-protection.patch
diff --git
a/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
b/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
index
fef483a
..
f27220a
100644
(file)
--- a/
target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
+++ b/
target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -9
63,6 +963
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -9
70,6 +970
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||