Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 3e68469c1885..f0413845f20e 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -121,6 +121,7 @@ struct dma_chan_percpu {
  * @local: per-cpu pointer to a struct dma_chan_percpu
  * @client-count: how many clients are using this channel
  * @table_count: number of appearances in the mem-to-mem allocation table
+ * @private: private data for certain client-channel associations
  */
 struct dma_chan {
         struct dma_device *device;
@@ -134,6 +135,7 @@ struct dma_chan {
         struct dma_chan_percpu *local;
         int client_count;
         int table_count;
+        void *private;
 };
 
 /**