mtd/drivers/mtd/nand nand_base.c,1.111,1.112

[David Woodhouse]

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

Modified Files:
	nand_base.c 
Log Message:
Merge from 2.6


Index: nand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_base.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- nand_base.c	12 Jul 2004 22:23:11 -0000	1.111
+++ nand_base.c	13 Jul 2004 08:28:21 -0000	1.112
@@ -1783,12 +1783,12 @@
  * @to:		offset to write to
  * @retlen:	pointer to variable to store the number of written bytes
  *
- * NAND write with iovec. This just calls the ecc function
+ * NAND write with kvec. This just calls the ecc function
  */
 static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, 
 		loff_t to, size_t * retlen)
 {
-	return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, 0));	
+	return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));	
 }
 
 /**
@@ -1865,7 +1865,7 @@
 
 	startpage = page & this->pagemask;
 
-	/* Loop until all iovecs' data has been written */
+	/* Loop until all kvec' data has been written */
 	len = 0;
 	while (count) {
 		/* If the given tuple is >= pagesize then