X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Ft128.c;fp=drivers%2Fscsi%2Ft128.c;h=21305fc91479c039c514568c29edd265fdd45e21;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=2df6747cb76fb5ce68a410b42ed748513ab5b80f;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 2df6747cb..21305fc91 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -126,15 +126,15 @@
 static struct override {
     unsigned long address;
     int irq;
-} overrides
+} overrides 
 #ifdef T128_OVERRIDE
     [] __initdata = T128_OVERRIDE;
 #else
-    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO},
+    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO}, 
         {0 ,IRQ_AUTO}, {0, IRQ_AUTO}};
 #endif
 
-#define NO_OVERRIDES ARRAY_SIZE(overrides)
+#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
 
 static struct base {
     unsigned int address;
@@ -143,7 +143,7 @@ static struct base {
     { 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}
 };
 
-#define NO_BASES ARRAY_SIZE(bases)
+#define NO_BASES (sizeof (bases) / sizeof (struct base))
 
 static struct signature {
     const char *string;
@@ -152,7 +152,7 @@ static struct signature {
 {"TSROM: SCSI BIOS, Version 1.12", 0x36},
 };
 
-#define NO_SIGNATURES ARRAY_SIZE(signatures)
+#define NO_SIGNATURES (sizeof (signatures) /  sizeof (struct signature))
 
 /*
  * Function : t128_setup(char *str, int *ints)
@@ -260,7 +260,7 @@ found:
 	    instance->irq = NCR5380_probe_irq(instance, T128_IRQS);
 
 	if (instance->irq != SCSI_IRQ_NONE) 
-	    if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", instance)) {
+	    if (request_irq(instance->irq, t128_intr, SA_INTERRUPT, "t128", instance)) {
 		printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
 		    instance->host_no, instance->irq);
 		instance->irq = SCSI_IRQ_NONE;