--- zzzz-none-000/linux-2.6.19.2/drivers/block/cciss.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5504/linux-2.6.19.2/drivers/block/cciss.c	2007-01-19 15:11:30.000000000 +0000
@@ -1300,12 +1300,6 @@
 
 	complete_buffers(rq->bio, rq->errors);
 
-	if (blk_fs_request(rq)) {
-		const int rw = rq_data_dir(rq);
-
-		disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
-	}
-
 #ifdef CCISS_DEBUG
 	printk("Done with %p\n", rq);
 #endif				/* CCISS_DEBUG */
@@ -1998,8 +1992,8 @@
 		*block_size = BLOCK_SIZE;
 	}
 	if (*total_size != (__u32) 0)
-		printk(KERN_INFO "      blocks= %llu block_size= %d\n",
-		(unsigned long long)*total_size, *block_size);
+		printk(KERN_INFO "      blocks= %lld block_size= %d\n",
+		*total_size, *block_size);
 	kfree(buf);
 	return;
 }
@@ -2033,8 +2027,8 @@
 		*total_size = 0;
 		*block_size = BLOCK_SIZE;
 	}
-	printk(KERN_INFO "      blocks= %llu block_size= %d\n",
-	       (unsigned long long)*total_size, *block_size);
+	printk(KERN_INFO "      blocks= %lld block_size= %d\n",
+	       *total_size, *block_size);
 	kfree(buf);
 	return;
 }