diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /drivers/ide/ns87415.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/ide/ns87415.c')
| -rw-r--r-- | drivers/ide/ns87415.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c index 83643ed9a426..ea48a3ee8063 100644 --- a/drivers/ide/ns87415.c +++ b/drivers/ide/ns87415.c | |||
| @@ -286,9 +286,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | |||
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | if (!using_inta) | 288 | if (!using_inta) |
| 289 | hwif->irq = __ide_default_irq(hwif->io_ports.data_addr); | 289 | hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel); |
| 290 | else if (!hwif->irq && hwif->mate && hwif->mate->irq) | ||
| 291 | hwif->irq = hwif->mate->irq; /* share IRQ with mate */ | ||
| 292 | 290 | ||
| 293 | if (!hwif->dma_base) | 291 | if (!hwif->dma_base) |
| 294 | return; | 292 | return; |