From eea6b100f9cd9334b3181edddfe304023fb9e9e7 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@st.com>
Date: Wed, 1 Feb 2012 16:12:18 +0530
Subject: [PATCH] --- yaml --- r: 297496 b: refs/heads/master c:
 dcc043dc0c60046cf6b75ca04a462314cf64e2ba h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/dmaengine.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 07e3413da0f5..5a39eb20cc49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7414a1b8b2b99093d6a271a1220557e87dc1ae94
+refs/heads/master: dcc043dc0c60046cf6b75ca04a462314cf64e2ba
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index 679b349d9b66..7e640bf27d2d 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -25,6 +25,7 @@
 #include <linux/uio.h>
 #include <linux/scatterlist.h>
 #include <linux/bitmap.h>
+#include <linux/types.h>
 #include <asm/page.h>
 
 /**
@@ -331,6 +332,9 @@ enum dma_slave_buswidth {
  * may or may not be applicable on memory sources.
  * @dst_maxburst: same as src_maxburst but for destination target
  * mutatis mutandis.
+ * @device_fc: Flow Controller Settings. Only valid for slave channels. Fill
+ * with 'true' if peripheral should be flow controller. Direction will be
+ * selected at Runtime.
  *
  * This struct is passed in as configuration data to a DMA engine
  * in order to set up a certain channel for DMA transport at runtime.
@@ -357,6 +361,7 @@ struct dma_slave_config {
 	enum dma_slave_buswidth dst_addr_width;
 	u32 src_maxburst;
 	u32 dst_maxburst;
+	bool device_fc;
 };
 
 static inline const char *dma_chan_name(struct dma_chan *chan)