move CONFIG_XFS_DEBUG to generic config

[openwrt.git] / target / linux / adm5120 / patches / 102-jedec_pmc_39lvxxx_chips.patch

diff --git a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
index 14c675cd9192452b413f80e9afcd709ac441d98d..7f352f67eca887d37a3735e3975d4da6c86cfadb 100644 (file)
--- a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
+++ b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/chips/jedec_probe.c
-+++ linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
+--- a/drivers/mtd/chips/jedec_probe.c
++++ b/drivers/mtd/chips/jedec_probe.c
 @@ -121,6 +121,10 @@
  #define UPD29F064115  0x221C
  
@@ -13,7 +11,7 @@ Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
  #define PM49FL002     0x006D
  #define PM49FL004     0x006E
  #define PM49FL008     0x006A
-@@ -1264,6 +1268,58 @@ static const struct amd_flash_info jedec
+@@ -1170,6 +1174,54 @@
                        ERASEINFO(0x02000,2),
                        ERASEINFO(0x04000,1),
                }
@@ -21,12 +19,11 @@ Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
 +              .mfr_id         = MANUFACTURER_PMC,
 +              .dev_id         = PM39LV512,
 +              .name           = "PMC Pm39LV512",
-+              .uaddr          = {
-+                      [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+              },
-+              .DevSize        = SIZE_64KiB,
-+              .CmdSet         = P_ID_AMD_STD,
-+              .NumEraseRegions= 1,
++              .devtypes       = CFI_DEVICETYPE_X8,
++              .uaddr          = MTD_UADDR_0x0555_0x02AA,
++              .dev_size       = SIZE_64KiB,
++              .cmd_set        = P_ID_AMD_STD,
++              .nr_regions     = 1,
 +              .regions        = {
 +                      ERASEINFO(0x01000,16),
 +              }
@@ -34,12 +31,11 @@ Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
 +              .mfr_id         = MANUFACTURER_PMC,
 +              .dev_id         = PM39LV010,
 +              .name           = "PMC Pm39LV010",
-+              .uaddr          = {
-+                      [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+              },
-+              .DevSize        = SIZE_128KiB,
-+              .CmdSet         = P_ID_AMD_STD,
-+              .NumEraseRegions= 1,
++              .devtypes       = CFI_DEVICETYPE_X8,
++              .uaddr          = MTD_UADDR_0x0555_0x02AA,
++              .dev_size       = SIZE_128KiB,
++              .cmd_set        = P_ID_AMD_STD,
++              .nr_regions     = 1,
 +              .regions        = {
 +                      ERASEINFO(0x01000,32),
 +              }
@@ -47,12 +43,11 @@ Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
 +              .mfr_id         = MANUFACTURER_PMC,
 +              .dev_id         = PM39LV020,
 +              .name           = "PMC Pm39LV020",
-+              .uaddr          = {
-+                      [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+              },
-+              .DevSize        = SIZE_256KiB,
-+              .CmdSet         = P_ID_AMD_STD,
-+              .NumEraseRegions= 1,
++              .devtypes       = CFI_DEVICETYPE_X8,
++              .uaddr          = MTD_UADDR_0x0555_0x02AA,
++              .dev_size       = SIZE_256KiB,
++              .cmd_set        = P_ID_AMD_STD,
++              .nr_regions     = 1,
 +              .regions        = {
 +                      ERASEINFO(0x01000,64),
 +              }
@@ -60,12 +55,11 @@ Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
 +              .mfr_id         = MANUFACTURER_PMC,
 +              .dev_id         = PM39LV040,
 +              .name           = "PMC Pm39LV040",
-+              .uaddr          = {
-+                      [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+              },
-+              .DevSize        = SIZE_512KiB,
-+              .CmdSet         = P_ID_AMD_STD,
-+              .NumEraseRegions= 1,
++              .devtypes       = CFI_DEVICETYPE_X8,
++              .uaddr          = MTD_UADDR_0x0555_0x02AA,
++              .dev_size       = SIZE_512KiB,
++              .cmd_set        = P_ID_AMD_STD,
++              .nr_regions     = 1,
 +              .regions        = {
 +                      ERASEINFO(0x01000,128),
 +              }