backport acx100 2.6.24 fixes from SVN

[openwrt.git] / target / linux / adm5120 / patches-2.6.23 / 101-cfi_fixup_macronix_bootloc.patch

diff --git a/target/linux/adm5120/patches-2.6.23/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.23/101-cfi_fixup_macronix_bootloc.patch
index 3650d4b..f3f678e 100644 (file)
--- a/target/linux/adm5120/patches-2.6.23/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.23/101-cfi_fixup_macronix_bootloc.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c
+Index: linux-2.6.23.14/drivers/mtd/chips/cfi_cmdset_0002.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.23.14.orig/drivers/mtd/chips/cfi_cmdset_0002.c
++++ linux-2.6.23.14/drivers/mtd/chips/cfi_cmdset_0002.c

 @@ -47,12 +47,19 @@
  #define MANUFACTURER_AMD      0x0001
  #define MANUFACTURER_ATMEL    0x001F
 @@ -47,12 +47,19 @@
  #define MANUFACTURER_AMD      0x0001
  #define MANUFACTURER_ATMEL    0x001F


@@ -74,10 +74,10 @@ Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c
        { 0, 0, NULL, NULL }
  };
  static struct cfi_fixup jedec_fixup_table[] = {
        { 0, 0, NULL, NULL }
  };
  static struct cfi_fixup jedec_fixup_table[] = {

-Index: linux-2.6.23/drivers/mtd/chips/Kconfig
+Index: linux-2.6.23.14/drivers/mtd/chips/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/drivers/mtd/chips/Kconfig
-+++ linux-2.6.23/drivers/mtd/chips/Kconfig
+--- linux-2.6.23.14.orig/drivers/mtd/chips/Kconfig
++++ linux-2.6.23.14/drivers/mtd/chips/Kconfig

 @@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.
 @@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.