diff --git a/[refs] b/[refs]
index f26b78a2170d..67034d109e9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213e4b0a3483b8cc99c4578923b9899e84e086e0
+refs/heads/master: 973d9e743979d4d3f06d8071c22187b2bdc0ef24
diff --git a/trunk/drivers/ide/ns87415.c b/trunk/drivers/ide/ns87415.c
index 83643ed9a426..56042a36d635 100644
--- a/trunk/drivers/ide/ns87415.c
+++ b/trunk/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 */