summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_amd.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-04-23 02:04:38 +0900
committerJeff Garzik <jeff@garzik.org>2007-04-28 14:46:18 -0400
commitabcfa88bd47d433c796cf724a8a8b321a7190bdd (patch)
tree3ce9963cc51559878ec8e1082bee5d901caaa5be /drivers/ata/pata_amd.c
parent169439c2e35f01e7832a9b4fc8a7446980c3d593 (diff)
downloadop-kernel-dev-abcfa88bd47d433c796cf724a8a8b321a7190bdd.zip
op-kernel-dev-abcfa88bd47d433c796cf724a8a8b321a7190bdd.tar.gz
pata_amd: remove contamination added during cable_detect conversion
This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9 - pata: cable methods. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r--drivers/ata/pata_amd.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 5a77e4e..536ee89 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)
if (type == 1 && rev > 0x7)
type = 2;
-#if defined(CONFIG_ATA_ACPI)
- /* Prefer the ACPI driver for Nvidia hardware */
- if (pdev->vendor == PCI_VENDOR_ID_NVIDIA && ata_pata_acpi_present(pdev))
- return -ENODEV;
-#endif
/* Check for AMD7411 */
if (type == 3)
/* FIFO is broken */
OpenPOWER on IntegriCloud