diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2011-11-12 16:30:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2011-11-17 02:11:42 -0500 |
| commit | aab9440453d19c1885fa391d4aafd7705f316247 (patch) | |
| tree | 5362398e3bd973675d2e4f4c10f70523d3e74d3b /drivers | |
| parent | ff956135008bca99b5e38f48f0d10a2c04fef2d6 (diff) | |
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: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/libata-sff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 63d53277d6a9..4cadfa28f940 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
| @@ -2533,10 +2533,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, | |||
| 2533 | if (rc) | 2533 | if (rc) |
| 2534 | goto out; | 2534 | goto out; |
| 2535 | 2535 | ||
| 2536 | #ifdef CONFIG_ATA_BMDMA | ||
| 2536 | if (bmdma) | 2537 | if (bmdma) |
| 2537 | /* prepare and activate BMDMA host */ | 2538 | /* prepare and activate BMDMA host */ |
| 2538 | rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); | 2539 | rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); |
| 2539 | else | 2540 | else |
| 2541 | #endif | ||
| 2540 | /* prepare and activate SFF host */ | 2542 | /* prepare and activate SFF host */ |
| 2541 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); | 2543 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); |
| 2542 | if (rc) | 2544 | if (rc) |
| @@ -2544,10 +2546,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, | |||
| 2544 | host->private_data = host_priv; | 2546 | host->private_data = host_priv; |
| 2545 | host->flags |= hflags; | 2547 | host->flags |= hflags; |
| 2546 | 2548 | ||
| 2549 | #ifdef CONFIG_ATA_BMDMA | ||
| 2547 | if (bmdma) { | 2550 | if (bmdma) { |
| 2548 | pci_set_master(pdev); | 2551 | pci_set_master(pdev); |
| 2549 | rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht); | 2552 | rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht); |
| 2550 | } else | 2553 | } else |
| 2554 | #endif | ||
| 2551 | rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht); | 2555 | rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht); |
| 2552 | out: | 2556 | out: |
| 2553 | if (rc == 0) | 2557 | if (rc == 0) |
