Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / include / linux / async_tx.h

diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index 45f6297821bd6c7afee48e247d8a25b027bc7445..5fc2ef8d97fac5851eb2d40f7b7e2d67a3be48e8 100644 (file)
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -21,6 +21,15 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 
+/* on architectures without dma-mapping capabilities we need to ensure
+ * that the asynchronous path compiles away
+ */
+#ifdef CONFIG_HAS_DMA
+#define __async_inline
+#else
+#define __async_inline __always_inline
+#endif
+
 /**
  * dma_chan_ref - object used to manage dma channels received from the
  *   dmaengine core.