Merge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[cascardo/linux.git] / include / linux / atmel-mci.h

diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 9177947..42a9e18 100644 (file)
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -2,6 +2,7 @@
 #define __LINUX_ATMEL_MCI_H
 
 #include <linux/types.h>
+#include <linux/dmaengine.h>
 
 #define ATMCI_MAX_NR_SLOTS     2
 
@@ -36,7 +37,8 @@ struct mci_slot_pdata {
  * @slot: Per-slot configuration data.
  */
 struct mci_platform_data {
-       struct mci_dma_data     *dma_slave;
+       void                    *dma_slave;
+       dma_filter_fn           dma_filter;
        struct mci_slot_pdata   slot[ATMCI_MAX_NR_SLOTS];
 };