---

yaml --- r: 316654 b: refs/heads/master c: 5902c9a h: refs/heads/master v: v3
git-mirror · Jul 13, 2012 · a8e3259 · a8e3259
1 parent 2701a9a
commit a8e3259
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a7b8e002e331d0599127f16613c32f425a14f2c
+refs/heads/master: 5902c9a7a2a9c2520af54af1ba7a9c7831664a17
diff --git a/trunk/include/linux/sh_dma.h b/trunk/include/linux/sh_dma.h
@@ -10,12 +10,16 @@
 #ifndef SH_DMA_H
 #define SH_DMA_H
 
-#include <linux/list.h>
 #include <linux/dmaengine.h>
+#include <linux/list.h>
+#include <linux/shdma-base.h>
 
 /* Used by slave DMA clients to request DMA to/from a specific peripheral */
 struct sh_dmae_slave {
-	unsigned int			slave_id; /* Set by the platform */
+	union {
+		unsigned int		slave_id; /* Set by the platform */
+		struct shdma_slave	shdma_slave;
+	};
 	struct device			*dma_dev; /* Set by the platform */
 	const struct sh_dmae_slave_config	*config;  /* Set by the driver */
 };