patch-2.3.45 linux/drivers/scsi/mac_esp.c

• Lines: 21
• Date: Sun Feb 13 11:21:42 2000
• Orig file: v2.3.44/linux/drivers/scsi/mac_esp.c
• Orig date: Thu Nov 11 20:11:48 1999

diff -u --recursive --new-file v2.3.44/linux/drivers/scsi/mac_esp.c linux/drivers/scsi/mac_esp.c
@@ -417,7 +417,9 @@
 			esp->irq = IRQ_MAC_SCSI;
 
 			request_irq(IRQ_MAC_SCSI, esp_intr, 0, "Mac ESP SCSI", esp);
+#if 0	/* conflicts with IOP ADB */
 			request_irq(IRQ_MAC_SCSIDRQ, fake_drq, 0, "Mac ESP DRQ", esp);
+#endif
 
 			if (macintosh_config->scsi_type == MAC_SCSI_QUADRA) {
 				esp->cfreq = 16500000;
@@ -429,8 +431,9 @@
 		} else { /* chipnum == 1 */
 
 			esp->irq = IRQ_MAC_SCSIDRQ;
-
+#if 0	/* conflicts with IOP ADB */
 			request_irq(IRQ_MAC_SCSIDRQ, esp_intr, 0, "Mac ESP SCSI 2", esp);
+#endif
 
 			esp->cfreq = 25000000;