pata_amd: remove contamination added during cable_detect conversion
Tejun Heo [Sun, 22 Apr 2007 17:04:38 +0000 (02:04 +0900)]
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>

drivers/ata/pata_amd.c

index 5a77e4e..536ee89 100644 (file)
@@ -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 */