[ppc40x] merge 2.6.28 patches

[openwrt.git] / target / linux / ar71xx / patches-2.6.28 / 105-mtd_m25p80_add_mx25lxxx_support.patch

diff --git a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch
index 2a4930e..d4b8ee9 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch
+++ b/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch
@@ -1,13 +1,13 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -506,6 +506,11 @@ static struct flash_info __devinitdata m
-       /* EON -- en25px */
-       { "en25p32", 0x1c2016, 64 * 1024, 64, },
+@@ -507,6 +507,11 @@ static struct flash_info __devinitdata m
+       { "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
+       { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
  
 +      /* Macronix -- mx25lxxx */
-+      { "mx25l32",  0xc22016,  64 * 1024,  64, },
-+      { "mx25l64",  0xc22017,  64 * 1024, 128, },
-+      { "mx25l128", 0xc22018,  64 * 1024, 256, },
++      { "mx25l32",  0xc22016, 0, 64 * 1024,  64, },
++      { "mx25l64",  0xc22017, 0, 64 * 1024, 128, },
++      { "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
 +
        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
        { "pm25lv512",         0, 32 * 1024, 2, SECT_4K },