[LV-k25-commit] CVS: kernel-2.5/drivers/scsi scsi_merge.c,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv12778

Modified Files:
	scsi_merge.c 
Log Message:
2.5.5 merge


Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scsi_merge.c	5 Jun 2002 21:55:04 -0000	1.3
+++ scsi_merge.c	2 Dec 2002 00:05:46 -0000	1.4
@@ -123,7 +123,7 @@
 {
 	struct Scsi_Host *SHpnt = SDpnt->host;
 	request_queue_t *q = &SDpnt->request_queue;
-	dma64_addr_t bounce_limit;
+	u64 bounce_limit;
 
 	/*
 	 * The generic merging functions work just fine for us.