Pull fluff into release branch

[sfrench/cifs-2.6.git] / drivers / scsi / t128.c

diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index a24f661b02701fbaf8b4cc6340767450cd328829..248d60b8d8994f235c1e01102cabb960243a3f37 100644 (file)
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -108,8 +108,7 @@
 
 #include <asm/system.h>
 #include <linux/signal.h>
-#include <linux/sched.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
@@ -260,7 +259,7 @@ found:
            instance->irq = NCR5380_probe_irq(instance, T128_IRQS);
 
        if (instance->irq != SCSI_IRQ_NONE) 
-           if (request_irq(instance->irq, t128_intr, SA_INTERRUPT, "t128", instance)) {
+           if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", instance)) {
                printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                    instance->host_no, instance->irq);
                instance->irq = SCSI_IRQ_NONE;