From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 02:44:18 +0000 (+1000)
Subject: Merge remote-tracking branch 'mmc/mmc-next'
X-Git-Tag: next-20140530~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1157d7f1f1160d64ec6c62ade0ab6e8ed9e76011;p=karo-tx-linux.git

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
	include/linux/omap-dma.h
---

1157d7f1f1160d64ec6c62ade0ab6e8ed9e76011
diff --cc include/linux/omap-dmaengine.h
index 000000000000,2b0b6aa01922..8e6906c72e90
mode 000000,100644..100644
--- a/include/linux/omap-dmaengine.h
+++ b/include/linux/omap-dmaengine.h
@@@ -1,0 -1,21 +1,21 @@@
+ /*
+  * OMAP DMA Engine support
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+ #ifndef __LINUX_OMAP_DMAENGINE_H
+ #define __LINUX_OMAP_DMAENGINE_H
+ 
+ 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)
+ {
+ 	return false;
+ }
+ #endif
+ #endif /* __LINUX_OMAP_DMAENGINE_H */