diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl> | 2004-02-09 17:00:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-09 17:00:29 -0800 |
| commit | 11c975e549c81716b8329f51f26228381d06eda4 (patch) | |
| tree | 9805c6c0c8e504d469ec100eb4d22f7923e5761a /include/linux | |
| parent | 1ec2fc7d07210145d4d08a99b3478d24fffb5f90 (diff) | |
[PATCH] fix build for CONFIG_BLK_DEV_IDEDMA=n
Ths "fix duplication of DMA {black,white}list in icside.c" patch broke it.
Noticed by Geert Uytterhoeven <geert@linux-m68k.org>.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index d247474de882..1533e9ab256e 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1626,6 +1626,7 @@ extern int __ide_dma_count(ide_drive_t *); extern int __ide_dma_verbose(ide_drive_t *); extern int __ide_dma_lostirq(ide_drive_t *); extern int __ide_dma_timeout(ide_drive_t *); +#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ #ifdef CONFIG_BLK_DEV_IDE_TCQ extern int __ide_dma_queued_on(ide_drive_t *drive); @@ -1634,13 +1635,12 @@ extern ide_startstop_t __ide_dma_queued_read(ide_drive_t *drive); extern ide_startstop_t __ide_dma_queued_write(ide_drive_t *drive); extern ide_startstop_t __ide_dma_queued_start(ide_drive_t *drive); #endif +#endif /* CONFIG_BLK_DEV_IDEDMA */ -#else +#ifndef CONFIG_BLK_DEV_IDEDMA_PCI static inline void ide_release_dma(ide_hwif_t *drive) {;} #endif -#endif /* CONFIG_BLK_DEV_IDEDMA */ - extern int ide_hwif_request_regions(ide_hwif_t *hwif); extern void ide_hwif_release_regions(ide_hwif_t* hwif); extern void ide_unregister (unsigned int index); |