patch-2.1.126 linux/drivers/scsi/aic7xxx.c

Next file: linux/drivers/scsi/eata.c
Previous file: linux/drivers/scsi/aic7xxx/sequencer.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.125/linux/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
@@ -328,7 +328,6 @@
 #include "hosts.h"
 #include "aic7xxx.h"
 
-#include "aic7xxx/bsd_q.h"
 #include "aic7xxx/sequencer.h"
 #include "aic7xxx/scsi_message.h"
 #include "aic7xxx_reg.h"
@@ -350,7 +349,7 @@
     0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-#define AIC7XXX_C_VERSION  "5.1.0"
+#define AIC7XXX_C_VERSION  "5.1.2"
 
 #define NUMBER(arr)     (sizeof(arr) / sizeof(arr[0]))
 #define MIN(a,b)        (((a) < (b)) ? (a) : (b))
@@ -6281,8 +6280,10 @@
       (((aic_inb(p, SEQADDR1) << 8) & 0x100) | aic_inb(p, SEQADDR0)));
     if (aic7xxx_panic_on_abort)
       aic7xxx_panic_abort(p, NULL);
+#ifdef CONFIG_PCI
     if (errno & PCIERRSTAT)
       aic7xxx_pci_intr(p);
+#endif
     if (errno & (SQPARERR | ILLOPCODE | ILLSADDR))
     {
       sti();

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