Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[mv-sheeva.git] / drivers / ide / ns87415.c

diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 83643ed9a426d1a43390987871e1839e5769d7eb..ea48a3ee8063960b3a2b204b99a8d9d639a9541f 100644 (file)
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -286,9 +286,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
        }
 
        if (!using_inta)
-               hwif->irq = __ide_default_irq(hwif->io_ports.data_addr);
-       else if (!hwif->irq && hwif->mate && hwif->mate->irq)
-               hwif->irq = hwif->mate->irq;    /* share IRQ with mate */
+               hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel);
 
        if (!hwif->dma_base)
                return;