diff options
| author | Tejun Heo <tj@kernel.org> | 2010-05-19 16:10:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-25 19:40:30 -0400 |
| commit | 1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa (patch) | |
| tree | 9f29bfdd32dd1bf497167cd7a8f596c7680059dd /drivers/ata/pata_cypress.c | |
| parent | c3b2889424c26f3b42962b6f39aabb4f1fd1b576 (diff) | |
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_cypress.c')
| -rw-r--r-- | drivers/ata/pata_cypress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c index 0fcc096b8dac..6d915b063d93 100644 --- a/drivers/ata/pata_cypress.c +++ b/drivers/ata/pata_cypress.c | |||
| @@ -138,7 +138,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *i | |||
| 138 | if (PCI_FUNC(pdev->devfn) != 1) | 138 | if (PCI_FUNC(pdev->devfn) != 1) |
| 139 | return -ENODEV; | 139 | return -ENODEV; |
| 140 | 140 | ||
| 141 | return ata_pci_sff_init_one(pdev, ppi, &cy82c693_sht, NULL, 0); | 141 | return ata_pci_bmdma_init_one(pdev, ppi, &cy82c693_sht, NULL, 0); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static const struct pci_device_id cy82c693[] = { | 144 | static const struct pci_device_id cy82c693[] = { |