From: Tejun Heo <htejun@gmail.com>
Date: Sun, 22 Apr 2007 17:04:38 +0000 (+0900)
Subject: pata_amd: remove contamination added during cable_detect conversion
X-Git-Tag: v2.6.22-rc1~1111^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abcfa88bd47d433c796cf724a8a8b321a7190bdd;p=linux-2.6

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>
---

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 5a77e4e60a..536ee892ab 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 */