Merge tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / include / linux / omap-dmaengine.h

diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h
index 2b0b6aa019221e5e9469e545b63ec96bd166f4ff..8e6906c72e9079abee55b360a2269a5e421c256f 100644 (file)
--- a/include/linux/omap-dmaengine.h
+++ b/include/linux/omap-dmaengine.h
@@ -10,7 +10,7 @@
 
 struct dma_chan;
 
-#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
+#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
 bool omap_dma_filter_fn(struct dma_chan *, void *);
 #else
 static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)