Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[deliverable/linux.git] / block / blk-settings.c

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 18fab5193d8136a6a30c4a57a645f1acfbb096e6..1344a0ea5cc6c00a89ef9536cbbfda7183d2b28b 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -332,7 +332,7 @@ EXPORT_SYMBOL(blk_queue_dma_pad);
  * device can support otherwise there won't be room for the drain
  * buffer.
  */
-extern int blk_queue_dma_drain(struct request_queue *q,
+int blk_queue_dma_drain(struct request_queue *q,
                               dma_drain_needed_fn *dma_drain_needed,
                               void *buf, unsigned int size)
 {