Merge branch 'topic/dw' into for-linus

This commit is contained in:
Vinod Koul
2014-06-09 21:55:40 +05:30
3 changed files with 40 additions and 24 deletions

View File

@@ -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)