diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/scsi/NCR5380.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/scsi/NCR5380.c')
| -rw-r--r-- | drivers/scsi/NCR5380.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 75f2f7ae2a8e..616810ad17d8 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
| @@ -585,7 +585,7 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible) | |||
| 585 | NCR5380_setup(instance); | 585 | NCR5380_setup(instance); |
| 586 | 586 | ||
| 587 | for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1) | 587 | for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1) |
| 588 | if ((mask & possible) && (request_irq(i, &probe_intr, SA_INTERRUPT, "NCR-probe", NULL) == 0)) | 588 | if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0)) |
| 589 | trying_irqs |= mask; | 589 | trying_irqs |= mask; |
| 590 | 590 | ||
| 591 | timeout = jiffies + (250 * HZ / 1000); | 591 | timeout = jiffies + (250 * HZ / 1000); |