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

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

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

Modified Files:
	scsi_merge.c 
Log Message:
Merge with 2.5.40


Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scsi_merge.c	12 Mar 2003 23:39:26 -0000	1.10
+++ scsi_merge.c	14 Mar 2003 00:43:39 -0000	1.11
@@ -140,7 +140,7 @@
 	 * Enable highmem I/O, if appropriate.
 	 */
 	bounce_limit = BLK_BOUNCE_HIGH;
-	if (SHpnt->highmem_io && (SDpnt->type == TYPE_DISK)) {
+	if (SHpnt->highmem_io) {
 #if CONFIG_PCI
 		if (!PCI_DMA_BUS_IS_PHYS)
 			/* Platforms with virtual-DMA translation