summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>2004-02-16 15:39:36 -0800
committerJames Simmons <jsimmons@infradead.org>2004-02-16 15:39:36 -0800
commita16a7cd862ef57607d63f8aef013d7465f7d7b6c (patch)
treefc3a364c99386dc07414e74355916798d7cbe16b /include/linux
parentc5910d7f9b18eed54d412df1cd44c677fd37162b (diff)
[PATCH] fix build with CONFIG_BLK_DEV_IDEDMA=n (once again)
My "__ide_dma_off()" cleanup uncovered some code that shouldn't be compiled when CONFIG_BLK_DEV_IDEDMA=n. Fix it and kill a warning in setup-pci.c. Noticed by Martin Diehl <lists@mdiehl.de>.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 92c7daf0a896..f7c97c9b0b8f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1626,6 +1626,9 @@ 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
+
+#else
+static inline int __ide_dma_off(ide_drive_t *drive) { return 0; }
#endif /* CONFIG_BLK_DEV_IDEDMA */
#ifndef CONFIG_BLK_DEV_IDEDMA_PCI