diff options
Diffstat (limited to 'drivers/ide/setup-pci.c')
| -rw-r--r-- | drivers/ide/setup-pci.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 7ebf992e8c2f..462ed3006c30 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
| @@ -580,7 +580,6 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a | |||
| 580 | int port; | 580 | int port; |
| 581 | int at_least_one_hwif_enabled = 0; | 581 | int at_least_one_hwif_enabled = 0; |
| 582 | ide_hwif_t *hwif, *mate = NULL; | 582 | ide_hwif_t *hwif, *mate = NULL; |
| 583 | static int secondpdc = 0; | ||
| 584 | u8 tmp; | 583 | u8 tmp; |
| 585 | 584 | ||
| 586 | index->all = 0xf0f0; | 585 | index->all = 0xf0f0; |
| @@ -592,21 +591,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a | |||
| 592 | for (port = 0; port <= 1; ++port) { | 591 | for (port = 0; port <= 1; ++port) { |
| 593 | ide_pci_enablebit_t *e = &(d->enablebits[port]); | 592 | ide_pci_enablebit_t *e = &(d->enablebits[port]); |
| 594 | 593 | ||
| 595 | /* | ||
| 596 | * If this is a Promise FakeRaid controller, | ||
| 597 | * the 2nd controller will be marked as | ||
| 598 | * disabled while it is actually there and enabled | ||
| 599 | * by the bios for raid purposes. | ||
| 600 | * Skip the normal "is it enabled" test for those. | ||
| 601 | */ | ||
| 602 | if ((d->flags & IDEPCI_FLAG_FORCE_PDC) && | ||
| 603 | (secondpdc++==1) && (port==1)) | ||
| 604 | goto controller_ok; | ||
| 605 | |||
| 606 | if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || | 594 | if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || |
| 607 | (tmp & e->mask) != e->val)) | 595 | (tmp & e->mask) != e->val)) |
| 608 | continue; /* port not enabled */ | 596 | continue; /* port not enabled */ |
| 609 | controller_ok: | ||
| 610 | 597 | ||
| 611 | if (d->channels <= port) | 598 | if (d->channels <= port) |
| 612 | break; | 599 | break; |
