Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36483
b: refs/heads/master
c: daac0ac
h: refs/heads/master
i:
  36481: 6fcb9e0
  36479: 769150c
v: v3
  • Loading branch information
Alan Cox authored and Jeff Garzik committed Sep 26, 2006
1 parent a737c82 commit 3d23fde
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c961922b73dab429a759f560952fd4c3f60bd6b3
refs/heads/master: daac0acd597618b99bba5f8fff31f21e4f283154
4 changes: 2 additions & 2 deletions trunk/drivers/ata/libata-sff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 3d23fde

Please sign in to comment.