aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index ead141e2db9e..ce322602982e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -850,13 +850,12 @@ int ide_set_dma(ide_drive_t *drive)
850EXPORT_SYMBOL_GPL(ide_set_dma); 850EXPORT_SYMBOL_GPL(ide_set_dma);
851 851
852#ifdef CONFIG_BLK_DEV_IDEDMA_PCI 852#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
853int __ide_dma_lostirq (ide_drive_t *drive) 853void ide_dma_lost_irq (ide_drive_t *drive)
854{ 854{
855 printk("%s: DMA interrupt recovery\n", drive->name); 855 printk("%s: DMA interrupt recovery\n", drive->name);
856 return 1;
857} 856}
858 857
859EXPORT_SYMBOL(__ide_dma_lostirq); 858EXPORT_SYMBOL(ide_dma_lost_irq);
860 859
861int __ide_dma_timeout (ide_drive_t *drive) 860int __ide_dma_timeout (ide_drive_t *drive)
862{ 861{
@@ -1020,8 +1019,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
1020 hwif->ide_dma_test_irq = &__ide_dma_test_irq; 1019 hwif->ide_dma_test_irq = &__ide_dma_test_irq;
1021 if (!hwif->ide_dma_timeout) 1020 if (!hwif->ide_dma_timeout)
1022 hwif->ide_dma_timeout = &__ide_dma_timeout; 1021 hwif->ide_dma_timeout = &__ide_dma_timeout;
1023 if (!hwif->ide_dma_lostirq) 1022 if (!hwif->dma_lost_irq)
1024 hwif->ide_dma_lostirq = &__ide_dma_lostirq; 1023 hwif->dma_lost_irq = &ide_dma_lost_irq;
1025 1024
1026 if (hwif->chipset != ide_trm290) { 1025 if (hwif->chipset != ide_trm290) {
1027 u8 dma_stat = hwif->INB(hwif->dma_status); 1026 u8 dma_stat = hwif->INB(hwif->dma_status);