From 3d23fde3c75af272d3b41c3ff376f04b135fab8a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 26 Sep 2006 17:55:37 +0100 Subject: [PATCH] --- yaml --- r: 36483 b: refs/heads/master c: daac0acd597618b99bba5f8fff31f21e4f283154 h: refs/heads/master i: 36481: 6fcb9e0fd0df129bf6eef8a877671eafc8dfebbf 36479: 769150ccd069340d8ef7047c47e6cf582336696f v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-sff.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 689a7048c73d..0286da607eb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c961922b73dab429a759f560952fd4c3f60bd6b3 +refs/heads/master: daac0acd597618b99bba5f8fff31f21e4f283154 diff --git a/trunk/drivers/ata/libata-sff.c b/trunk/drivers/ata/libata-sff.c index 688bb55e197a..9222b6bb010a 100644 --- a/trunk/drivers/ata/libata-sff.c +++ b/trunk/drivers/ata/libata-sff.c @@ -881,7 +881,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, probe_ent->private_data = port[0]->private_data; if (port_mask & ATA_PORT_PRIMARY) { - probe_ent->irq = 14; + probe_ent->irq = ATA_PRIMARY_IRQ; probe_ent->port[0].cmd_addr = ATA_PRIMARY_CMD; probe_ent->port[0].altstatus_addr = probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL; @@ -896,7 +896,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, if (port_mask & ATA_PORT_SECONDARY) { if (probe_ent->irq) - probe_ent->irq2 = 15; + probe_ent->irq2 = ATA_SECONDARY_IRQ; else probe_ent->irq = 15; probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;