diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2014-06-09 21:55:40 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-06-09 21:55:40 +0530 |
| commit | 3c814be9712f1a9f22009fb56bf96cf6de2ec663 (patch) | |
| tree | de68086c72202eaa6625c8262d403f7409dff3b4 /include | |
| parent | dmaengine: sh: don't use dynamic static allocation (diff) | |
| parent | dmaengine: dw: check return code of dma_async_device_register() (diff) | |
Merge branch 'topic/dw' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap-dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 41a13e70f41f..7944cdc27bed 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.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) |