patch-2.1.113 linux/drivers/scsi/mvme16x.c

Next file: linux/drivers/scsi/mvme16x.h
Previous file: linux/drivers/scsi/mac_scsi.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.112/linux/drivers/scsi/mvme16x.c linux/drivers/scsi/mvme16x.c
@@ -8,7 +8,6 @@
 #include <linux/blk.h>
 #include <linux/sched.h>
 #include <linux/version.h>
-#include <linux/zorro.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -38,6 +37,8 @@
     int clock;
     long long options;
 
+    if (!MACH_IS_MVME16x)
+		return 0;
     if (mvme16x_config & MVME16x_CONFIG_NO_SCSICHIP) {
 	printk ("SCSI detection disabled, SCSI chip not present\n");
 	return 0;
@@ -52,7 +53,7 @@
     clock = 66000000;	/* 66MHz SCSI Clock */
 
     ncr53c7xx_init(tpnt, 0, 710, (u32)0xfff47000,
-			0, 0x55, DMA_NONE,
+			0, MVME16x_IRQ_SCSI, DMA_NONE,
 			options, clock);
     called = 1;
     return 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov