Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

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

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 5c55e152e7189f7ea6dd7ac287cd517bfa3a03cf..bd337a91429855f290859ea03b9e377cd1c6eda9 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2867,7 +2867,7 @@ static int nsp32_detect(struct scsi_host_template *sht)
        nsp32_do_bus_reset(data);
 
        ret = request_irq(host->irq, do_nsp32_isr,
-                         SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data);
+                         IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
        if (ret < 0) {
                nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
                          "SCSI PCI controller. Interrupt: %d", host->irq);