From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 24 Mar 2009 22:22:48 +0000 (+0100)
Subject: ns87415: use pci_get_legacy_ide_irq()
X-Git-Tag: MMI-PSA29.97-13-9~29240^2~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=973d9e743979d4d3f06d8071c22187b2bdc0ef24;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ns87415: use pci_get_legacy_ide_irq()

Fix ->init_hwif to use pci_get_legacy_ide_irq() instead of
__ide_default_irq().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 83643ed9a426..56042a36d635 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -286,7 +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);
+		hwif->irq = pci_get_legacy_ide_irq(dev, hwif->channel);
 	else if (!hwif->irq && hwif->mate && hwif->mate->irq)
 		hwif->irq = hwif->mate->irq;	/* share IRQ with mate */