]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/ata/ata_generic.c
ata: Switch all my stuff to a common address
[linux-2.6-omap-h63xx.git] / drivers / ata / ata_generic.c
index b23e2a1099c56f487aac4cc1e124c70b6427d965..5c33767e66de8e25493fe37343c5fe433c2971b7 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  ata_generic.c - Generic PATA/SATA controller driver.
- *  Copyright 2005 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *  Copyright 2005 Red Hat Inc, all rights reserved.
  *
  *  Elements from ide/pci/generic.c
  *         Copyright (C) 2001-2002     Andre Hedrick <andre@linux-ide.org>
@@ -150,9 +150,15 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
                return -ENODEV;
 
        if (dev->vendor == PCI_VENDOR_ID_AL)
-               ata_pci_clear_simplex(dev);
+               ata_pci_bmdma_clear_simplex(dev);
 
-       return ata_pci_init_one(dev, ppi, &generic_sht, NULL);
+       if (dev->vendor == PCI_VENDOR_ID_ATI) {
+               int rc = pcim_enable_device(dev);
+               if (rc < 0)
+                       return rc;
+               pcim_pin_device(dev);
+       }
+       return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
 }
 
 static struct pci_device_id ata_generic[] = {