[kernel] make all 3.6 patches apply and build

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.6 / 476-mtd-m25p80-allow-to-disable-small-sector-erase.patch

diff --git a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
index 231d4548c7d6ce569562e46eda6194140ae0534e..270586ea747b910570428b49b0a8f8be7dc0de1f 100644 (file)
--- a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
+++ b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
-@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ
+@@ -110,6 +110,14 @@ config MTD_SPEAR_SMI
        help
-         This option enables FAST_READ access supported by ST M25Pxx.
+         This enable SNOR support on SPEAR platforms using SMI controller
  
 +config M25PXX_PREFER_SMALL_SECTOR_ERASE
 +      bool "Prefer small sector erase"
@@ -30,8 +30,8 @@
  /****************************************************************************/
  
  struct m25p {
-@@ -925,7 +931,7 @@ static int __devinit m25p_probe(struct s
-               flash->mtd.write = m25p80_write;
+@@ -899,7 +905,7 @@ static int __devinit m25p_probe(struct s
+               flash->mtd._write = m25p80_write;
  
        /* prefer "small sector" erase if possible */
 -      if (info->flags & SECT_4K) {