Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=abcfa88bd47d433c796cf724a8a8b321a7190bdd
Commit:     abcfa88bd47d433c796cf724a8a8b321a7190bdd
Parent:     169439c2e35f01e7832a9b4fc8a7446980c3d593
Author:     Tejun Heo <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 23 02:04:38 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 14:46:18 2007 -0400

    pata_amd: remove contamination added during cable_detect conversion
    
    This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9
     - pata: cable methods.
    
    Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
    Cc: Alan Cox <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 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 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to