Commit aab94404 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Jeff Garzik

libata: fix build without BMDMA

fix these errors:
drivers/ata/libata-sff.c:2538:3: error: implicit declaration of function
'ata_pci_bmdma_prepare_host'
drivers/ata/libata-sff.c:2549:40: error: 'ata_bmdma_interrupt'
undeclared (first use in this function)
Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent ff956135
...@@ -2533,10 +2533,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, ...@@ -2533,10 +2533,12 @@ static int ata_pci_init_one(struct pci_dev *pdev,
if (rc) if (rc)
goto out; goto out;
#ifdef CONFIG_ATA_BMDMA
if (bmdma) if (bmdma)
/* prepare and activate BMDMA host */ /* prepare and activate BMDMA host */
rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host);
else else
#endif
/* prepare and activate SFF host */ /* prepare and activate SFF host */
rc = ata_pci_sff_prepare_host(pdev, ppi, &host); rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
if (rc) if (rc)
...@@ -2544,10 +2546,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, ...@@ -2544,10 +2546,12 @@ static int ata_pci_init_one(struct pci_dev *pdev,
host->private_data = host_priv; host->private_data = host_priv;
host->flags |= hflags; host->flags |= hflags;
#ifdef CONFIG_ATA_BMDMA
if (bmdma) { if (bmdma) {
pci_set_master(pdev); pci_set_master(pdev);
rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht); rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);
} else } else
#endif
rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht); rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);
out: out:
if (rc == 0) if (rc == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment