OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 34... Line 34...
34 + Any flash chip larger than the size specified in this option will 34 + Any flash chip larger than the size specified in this option will
35 + not use 4K sectors. 35 + not use 4K sectors.
36 + 36 +
37 config SPI_ATMEL_QUADSPI 37 config SPI_ATMEL_QUADSPI
38 tristate "Atmel Quad SPI Controller" 38 tristate "Atmel Quad SPI Controller"
39 depends on ARCH_AT91 || (ARM && COMPILE_TEST && !ARCH_EBSA110) 39 depends on ARCH_AT91 || (ARM && COMPILE_TEST)
40 --- a/drivers/mtd/spi-nor/spi-nor.c 40 --- a/drivers/mtd/spi-nor/spi-nor.c
41 +++ b/drivers/mtd/spi-nor/spi-nor.c 41 +++ b/drivers/mtd/spi-nor/spi-nor.c
42 @@ -1648,10 +1648,12 @@ int spi_nor_scan(struct spi_nor *nor, co 42 @@ -1642,10 +1642,12 @@ int spi_nor_scan(struct spi_nor *nor, co
Line 43... Line 43...
43 43
44 #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS 44 #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
45 /* prefer "small sector" erase if possible */ 45 /* prefer "small sector" erase if possible */
46 - if (info->flags & SECT_4K) { 46 - if (info->flags & SECT_4K) {