linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / aic7xxx_old.c

diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index ba3bcca..770f164 100644 (file)
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -249,6 +249,8 @@
 #include <linux/stat.h>
 #include <linux/slab.h>        /* for kmalloc() */
 
+#include <linux/config.h>        /* for CONFIG_PCI */
+
 #define AIC7XXX_C_VERSION  "5.2.6"
 
 #define ALL_TARGETS -1
@@ -1563,7 +1565,7 @@ aic7xxx_check_patch(struct aic7xxx_host *p,
   struct sequencer_patch *last_patch;
   int num_patches;
 
-  num_patches = ARRAY_SIZE(sequencer_patches);
+  num_patches = sizeof(sequencer_patches)/sizeof(struct sequencer_patch);
   last_patch = &sequencer_patches[num_patches];
   cur_patch = *start_patch;
 
@@ -8320,11 +8322,11 @@ aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
   }
   else
   {
-    result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_SHARED,
+    result = (request_irq(p->irq, do_aic7xxx_isr, SA_SHIRQ,
               "aic7xxx", p));
     if (result < 0)
     {
-      result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_DISABLED | IRQF_SHARED,
+      result = (request_irq(p->irq, do_aic7xxx_isr, SA_INTERRUPT | SA_SHIRQ,
               "aic7xxx", p));
     }
   }