mtd/drivers/mtd/chips cfi_cmdset_0002.c,1.81,1.82

[Thayne Harbaugh]

Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv3484

Modified Files:
	cfi_cmdset_0002.c 
Log Message:
Missed some changes of int -> cfi_word

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- cfi_cmdset_0002.c	29 Sep 2003 23:10:10 -0000	1.81
+++ cfi_cmdset_0002.c	30 Sep 2003 14:08:00 -0000	1.82
@@ -758,7 +758,7 @@
 	}
 
 	if ( ta ) {
-		int dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
+		cfi_word dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
 		if ( status & dq5mask ) {
 			/* dq5 asserted - decode interleave chips */
 			printk( KERN_WARNING
@@ -983,8 +983,8 @@
  */
 static inline int do_erase_chip(struct map_info *map, struct flchip *chip)
 {
-	unsigned int oldstatus, status, prev_oldstatus, prev_status;
-	unsigned int dq6;
+	cfi_word oldstatus, status, prev_oldstatus, prev_status;
+	cfi_word dq6;
 	unsigned long timeo = jiffies + HZ;
 	unsigned long int adr;
 	struct cfi_private *cfi = map->fldrv_priv;
@@ -1130,7 +1130,7 @@
 	}
 
 	if ( ta ) {
-		int dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
+		cfi_word dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
 		if ( status & dq5mask ) {
 			/* dq5 asserted - decode interleave chips */
 			printk( KERN_WARNING
@@ -1318,7 +1318,7 @@
 	}
 
 	if ( ta ) {
-		int dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
+		cfi_word dq5mask = ( ( status ^ oldstatus ) & dq6 ) >> 1;
 		if ( status & dq5mask ) {
 			/* dq5 asserted - decode interleave chips */
 			printk( KERN_WARNING