diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 15:18:02 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 15:18:02 +0000 |
commit | 54bcc569f36c360145147790088d4ded630bbcfc (patch) | |
tree | 2da5c424fee089315ca964b5579e0171de465eee /target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch | |
parent | 2c64c2f0c9d646c60458aff66c4bbe707bdd93f8 (diff) |
[adm5120] fix some build errors on .25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch')
-rw-r--r-- | target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch index 72665d7f19..a8720f3f21 100644 --- a/target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch +++ b/target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c +Index: linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c =================================================================== ---- linux-2.6.25.orig/drivers/mtd/chips/jedec_probe.c -+++ linux-2.6.25/drivers/mtd/chips/jedec_probe.c +--- linux-2.6.25.1.orig/drivers/mtd/chips/jedec_probe.c ++++ linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c @@ -121,6 +121,10 @@ #define UPD29F064115 0x221C @@ -13,7 +13,7 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c #define PM49FL002 0x006D #define PM49FL004 0x006E #define PM49FL008 0x006A -@@ -1170,6 +1174,58 @@ static const struct amd_flash_info jedec +@@ -1170,6 +1174,54 @@ static const struct amd_flash_info jedec ERASEINFO(0x02000,2), ERASEINFO(0x04000,1), } @@ -21,12 +21,11 @@ Index: linux-2.6.25/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 +33,11 @@ Index: linux-2.6.25/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 +45,11 @@ Index: linux-2.6.25/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 +57,11 @@ Index: linux-2.6.25/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), + } |