git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
scsi
/
dec_esp.c
diff --git
a/drivers/scsi/dec_esp.c
b/drivers/scsi/dec_esp.c
index
a35ee43
..
eb32062
100644
(file)
--- a/
drivers/scsi/dec_esp.c
+++ b/
drivers/scsi/dec_esp.c
@@
-202,19
+202,19
@@
static int dec_esp_detect(struct scsi_host_template * tpnt)
esp_initialize(esp);
esp_initialize(esp);
- if (request_irq(esp->irq, esp_intr,
SA_INTERRUPT
,
+ if (request_irq(esp->irq, esp_intr,
IRQF_DISABLED
,
"ncr53c94", esp->ehost))
goto err_dealloc;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],
"ncr53c94", esp->ehost))
goto err_dealloc;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],
- scsi_dma_merr_int,
SA_INTERRUPT
,
+ scsi_dma_merr_int,
IRQF_DISABLED
,
"ncr53c94 error", esp->ehost))
goto err_free_irq;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],
"ncr53c94 error", esp->ehost))
goto err_free_irq;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],
- scsi_dma_err_int,
SA_INTERRUPT
,
+ scsi_dma_err_int,
IRQF_DISABLED
,
"ncr53c94 overrun", esp->ehost))
goto err_free_irq_merr;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA],
"ncr53c94 overrun", esp->ehost))
goto err_free_irq_merr;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA],
- scsi_dma_int,
SA_INTERRUPT
,
+ scsi_dma_int,
IRQF_DISABLED
,
"ncr53c94 dma", esp->ehost))
goto err_free_irq_err;
"ncr53c94 dma", esp->ehost))
goto err_free_irq_err;
@@
-276,7
+276,7
@@
static int dec_esp_detect(struct scsi_host_template * tpnt)
esp->dma_mmu_release_scsi_sgl = 0;
esp->dma_advance_sg = 0;
esp->dma_mmu_release_scsi_sgl = 0;
esp->dma_advance_sg = 0;
- if (request_irq(esp->irq, esp_intr,
SA_INTERRUPT
,
+ if (request_irq(esp->irq, esp_intr,
IRQF_DISABLED
,
"PMAZ_AA", esp->ehost)) {
esp_deallocate(esp);
release_tc_card(slot);
"PMAZ_AA", esp->ehost)) {
esp_deallocate(esp);
release_tc_card(slot);