diff options
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_amd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 5a77e4e60a42..536ee892ab72 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
| @@ -639,11 +639,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 639 | if (type == 1 && rev > 0x7) | 639 | if (type == 1 && rev > 0x7) |
| 640 | type = 2; | 640 | type = 2; |
| 641 | 641 | ||
| 642 | #if defined(CONFIG_ATA_ACPI) | ||
| 643 | /* Prefer the ACPI driver for Nvidia hardware */ | ||
| 644 | if (pdev->vendor == PCI_VENDOR_ID_NVIDIA && ata_pata_acpi_present(pdev)) | ||
| 645 | return -ENODEV; | ||
| 646 | #endif | ||
| 647 | /* Check for AMD7411 */ | 642 | /* Check for AMD7411 */ |
| 648 | if (type == 3) | 643 | if (type == 3) |
| 649 | /* FIFO is broken */ | 644 | /* FIFO is broken */ |