patch-2.4.0-prerelease linux/drivers/scsi/scsi.h

Next file: linux/drivers/scsi/scsiiom.c
Previous file: linux/drivers/scsi/pcmcia/Makefile
Back to the patch index
Back to the overall index

Lines: 9
Date: Sun Dec 31 11:11:32 2000
Orig file: v2.4.0-test12/linux/drivers/scsi/scsi.h
Orig date: Sun Oct 8 10:50:25 2000


diff -u --recursive --new-file v2.4.0-test12/linux/drivers/scsi/scsi.h linux/drivers/scsi/scsi.h
@@ -61,7 +61,7 @@
 #endif
 #endif
 
-#ifdef CONFIG_SBUS
+#if defined(CONFIG_SBUS) && !defined(CONFIG_SUN3)
 #include <asm/sbus.h>
 #if ((SCSI_DATA_UNKNOWN == SBUS_DMA_BIDIRECTIONAL) && (SCSI_DATA_WRITE == SBUS_DMA_TODEVICE) && (SCSI_DATA_READ == SBUS_DMA_FROMDEVICE) && (SCSI_DATA_NONE == SBUS_DMA_NONE))
 #define scsi_to_sbus_dma_dir(scsi_dir)	((int)(scsi_dir))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi

TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)