Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 462-m25p80-mx-disable-software-protection.patch
1 --- a/drivers/mtd/spi-nor/spi-nor.c
2 +++ b/drivers/mtd/spi-nor/spi-nor.c
3 @@ -970,6 +970,7 @@ int spi_nor_scan(struct spi_nor *nor, co
4  
5         if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
6             JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
7 +           JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX ||
8             JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
9                 write_enable(nor);
10                 write_sr(nor, 0);