upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / ide / pci / amd74xx.c

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 3967254..fc7b594 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -416,8 +416,8 @@ static void __init init_hwif_amd74xx(ide_hwif_t *hwif)
 {
        int i;
 
-       if (!hwif->irq)
-               hwif->irq = hwif->channel ? 15 : 14;
+       if (hwif->irq == 0) /* 0 is bogus but will do for now */
+               hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel);
 
        hwif->autodma = 0;