From 033914dd6a5d4c0009654d6abdc3bd61089508e0 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 11 Dec 2011 10:04:51 +0100 Subject: [PATCH] --- yaml --- r: 282278 b: refs/heads/master c: dddaaf793d73f1e3dc931b2040f1578b1bdf0ece h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mac_scsi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a32edd4406e..8bd526003b70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b12859ae4776d868ea732424a452826d9ee03df +refs/heads/master: dddaaf793d73f1e3dc931b2040f1578b1bdf0ece diff --git a/trunk/drivers/scsi/mac_scsi.c b/trunk/drivers/scsi/mac_scsi.c index af3a6af97cc7..ea2bde206f7f 100644 --- a/trunk/drivers/scsi/mac_scsi.c +++ b/trunk/drivers/scsi/mac_scsi.c @@ -291,8 +291,7 @@ int __init macscsi_detect(struct scsi_host_template * tpnt) ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0; if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW, - "ncr5380", instance)) { + if (request_irq(instance->irq, NCR5380_intr, 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;