Merge branch 'linus' into x86/pat

[linux-2.6] / drivers / ata / pata_netcell.c

diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 65389d1837b3694bdbd2e38875c76f1f51604360..d9719c8b9dbe2540028695af0635f59ae1888331 100644 (file)
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -48,7 +48,6 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 {
        static int printed_version;
        static const struct ata_port_info info = {
-               .sht            = &netcell_sht,
                .flags          = ATA_FLAG_SLAVE_POSS,
                /* Actually we don't really care about these as the
                   firmware deals with it */
@@ -69,10 +68,10 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                return rc;
 
        /* Any chip specific setup/optimisation/messages here */
-       ata_pci_clear_simplex(pdev);
+       ata_pci_bmdma_clear_simplex(pdev);
 
        /* And let the library code do the work */
-       return ata_pci_init_one(pdev, port_info);
+       return ata_pci_sff_init_one(pdev, port_info, &netcell_sht, NULL);
 }
 
 static const struct pci_device_id netcell_pci_tbl[] = {