Pull model-name into release branch

[linux-2.6] / drivers / scsi / sim710.c

diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index 2b2789345c13e67cc7b754ed9304e106883d0f44..b27e85428daab7a59decef0a2ba3e170afb0bca2 100644 (file)
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -133,7 +133,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
        host->this_id = scsi_id;
        host->base = base_addr;
        host->irq = irq;
-       if (request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) {
+       if (request_irq(irq, NCR_700_intr, IRQF_SHARED, "sim710", host)) {
                printk(KERN_ERR "sim710: request_irq failed\n");
                goto out_put_host;
        }