From d8be7d38e86eb01da1290895d5ca0928c2d342c0 Mon Sep 17 00:00:00 2001
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Sat, 1 Jan 2011 23:00:23 +0000
Subject: [PATCH] --- yaml --- r: 231622 b: refs/heads/master c:
 98d530fe246b65fbd3cdeeeca319a80c46cb4793 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 525140dd5d1f..208e5f61b8a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda36f9821321edf65d69da5c0807df7e73d26fc
+refs/heads/master: 98d530fe246b65fbd3cdeeeca319a80c46cb4793
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index 9d8688b92d8b..830935b7c49c 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -532,7 +532,7 @@ static inline int dmaengine_resume(struct dma_chan *chan)
 	return dmaengine_device_control(chan, DMA_RESUME, 0);
 }
 
-static inline int dmaengine_submit(struct dma_async_tx_descriptor *desc)
+static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)
 {
 	return desc->tx_submit(desc);
 }