kernel: add a new scheduler action for restoring the connection tracking mark - usefu...

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

diff --git a/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
index 293ed8b..2def379 100644 (file)
--- a/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,18 +1,18 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
+@@ -652,6 +652,11 @@ static const struct spi_device_id m25p_i
        { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
        { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
  
 +      /* Numonyx -- xxxs33b */
-+      { "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+      { "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+      { "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
++      { "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
++      { "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
++      { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
 +
        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
+       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
+@@ -836,11 +841,12 @@ static int __devinit m25p_probe(struct s
        dev_set_drvdata(&spi->dev, flash);
  
        /*