kernel: refresh patches with 2.6.34-rc4

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

diff --git a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
index 2f6d899..293ed8b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
+@@ -650,6 +650,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) },
  
@@ -12,7 +12,7 @@
        /* 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) },
-@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
+@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
        dev_set_drvdata(&spi->dev, flash);
  
        /*