kernel: update linux 3.6 to 3.6.11

[oweals/openwrt.git] / target / linux / generic / patches-3.6 / 470-mtd_m25p80_add_pm25lv_flash_support.patch

diff --git a/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
index ff27d04f8fc962d942bc6d64452ce7314714bbf3..76989506aa854f4b2249dde868bca9d289bc370f 100644 (file)
--- a/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -8,7 +8,7 @@
  #define       OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
  #define       OPCODE_RDID             0x9f    /* Read JEDEC ID */
  
-@@ -625,6 +626,7 @@ struct flash_info {
+@@ -594,6 +595,7 @@ struct flash_info {
        u16             flags;
  #define       SECT_4K         0x01            /* OPCODE_BE_4K works uniformly */
  #define       M25P_NO_ERASE   0x02            /* No erase command needed */
@@ -16,7 +16,7 @@
  };
  
  #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)    \
-@@ -686,6 +688,10 @@ static const struct spi_device_id m25p_i
+@@ -659,6 +661,10 @@ static const struct spi_device_id m25p_i
        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
        { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
  
@@ -27,7 +27,7 @@
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
         */
-@@ -921,6 +927,9 @@ static int __devinit m25p_probe(struct s
+@@ -895,6 +901,9 @@ static int __devinit m25p_probe(struct s
        if (info->flags & SECT_4K) {
                flash->erase_opcode = OPCODE_BE_4K;
                flash->mtd.erasesize = 4096;