summaryrefslogtreecommitdiff
path: root/drivers/ata/pata_marvell.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-05-20 00:10:22 +0400
committerJeff Garzik <jgarzik@redhat.com>2010-05-26 03:40:30 +0400
commit1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa (patch)
tree9f29bfdd32dd1bf497167cd7a8f596c7680059dd /drivers/ata/pata_marvell.c
parentc3b2889424c26f3b42962b6f39aabb4f1fd1b576 (diff)
downloadlinux-1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa.tar.xz
libata-sff: separate out BMDMA init
Separate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one() from their SFF counterparts. SFF ones no longer try to initialize BMDMA or set PCI master. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r--drivers/ata/pata_marvell.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index e8ca02e5a71d..dd38083dcbeb 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -153,7 +153,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
return -ENODEV;
}
#endif
- return ata_pci_sff_init_one(pdev, ppi, &marvell_sht, NULL, 0);
+ return ata_pci_bmdma_init_one(pdev, ppi, &marvell_sht, NULL, 0);
}
static const struct pci_device_id marvell_pci_tbl[] = {