[kernel] update to kernel 2.6.36.4

[openwrt.git] / target / linux / generic / patches-2.6.32 / 086-mtd_m25p80_add_xxxs33b_support.patch

diff --git a/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
index a71bcf1..16c21aa 100644 (file)
--- a/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
+@@ -632,6 +632,11 @@ static struct flash_info __devinitdata m
        { "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
        { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
  
@@ -10,9 +10,9 @@
 +      { "640s33b",  0x898913, 0, 64 * 1024, 128, },
 +
        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-       { "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
-       { "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
-@@ -784,11 +789,12 @@ static int __devinit m25p_probe(struct s
+       { "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K_ALT },
+       { "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K_ALT },
+@@ -786,11 +791,12 @@ static int __devinit m25p_probe(struct s
        dev_set_drvdata(&spi->dev, flash);
  
        /*