Merge tag 'for-f2fs-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-block.git] / drivers / scsi / g_NCR5380.c

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 5cec6c60ca22dd9df89f3ebb8f19ed78c781b0a9..7176365e916b7aff6ca310baa9e75044dab9cf11 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -461,7 +461,7 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
 
                if (instance->irq != SCSI_IRQ_NONE)
                        if (request_irq(instance->irq, generic_NCR5380_intr,
-                                       IRQF_DISABLED, "NCR5380", instance)) {
+                                       0, "NCR5380", instance)) {
                                printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
                                instance->irq = SCSI_IRQ_NONE;
                        }