fix some build errors on .25

SVN-Revision: 11008

2 files changed, 56 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 72665d7..a8720f3 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),
 +		}
diff --git a/target/linux/adm5120/patches-2.6.25/910-pata_rb153_cf_fix_compiler_warning.patch b/target/linux/adm5120/patches-2.6.25/910-pata_rb153_cf_fix_compiler_warning.patch
new file mode 100644
index 0000000..629ec65
--- /dev/null
+++ b/target/linux/adm5120/patches-2.6.25/910-pata_rb153_cf_fix_compiler_warning.patch
@@ -0,0 +1,32 @@
+Index: linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/ata/pata_rb153_cf.c
++++ linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
+@@ -68,20 +68,23 @@ static void rb153_pata_exec_command(stru
+ 	rb153_pata_finish_io(ap);
+ }
+ 
+-static void rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
++static unsigned int rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
+ 				unsigned int buflen, int write_data)
+ {
+ 	void __iomem *ioaddr = adev->link->ap->ioaddr.data_addr;
+-
++	unsigned int t;
++	
++	t = buflen;	
+ 	if (write_data) {
+-		for (; buflen > 0; buflen--, buf++)
++		for (; t > 0; t--, buf++)
+ 			writeb(*buf, ioaddr);
+ 	} else {
+-		for (; buflen > 0; buflen--, buf++)
++		for (; t > 0; t--, buf++)
+ 			*buf = readb(ioaddr);
+ 	}
+ 
+ 	rb153_pata_finish_io(adev->link->ap);
++	return buflen;
+ }
+ 
+ static void rb153_pata_freeze(struct ata_port *ap)