kernel: update linux 3.7 to 3.7.5

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.7 / 470-mtd_m25p80_add_pm25lv_flash_support.patch

diff --git a/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
index 5ad1713461eb0ae8d1a03b05cf906a4bfaea7ffd..28e2fa80cafd6b153948b45d16aa76f3cc616337 100644 (file)
--- a/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -16,7 +16,7 @@
  };
  
  #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)    \
-@@ -667,6 +669,10 @@ static const struct spi_device_id m25p_i
+@@ -671,6 +673,10 @@ static const struct spi_device_id m25p_i
        { "n25q128",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
        { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
  
@@ -27,7 +27,7 @@
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
         */
-@@ -907,6 +913,9 @@ static int __devinit m25p_probe(struct s
+@@ -911,6 +917,9 @@ static int __devinit m25p_probe(struct s
        if (info->flags & SECT_4K) {
                flash->erase_opcode = OPCODE_BE_4K;
                flash->mtd.erasesize = 4096;