Merge branch 'samsung_dma' into next

2011-09-21 11:53:30 +05:30
parent f8de8f4ce2 51ddf31da1
commit 0745c9a5e3
40 changed files with 1600 additions and 1969 deletions
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -19,12 +19,8 @@ struct dma_pl330_peri {
 	 * Peri_Req i/f of the DMAC that is
 	 * peripheral could be reached from.
 	 */
-	u8 peri_id; /* {0, 31} */
+	u8 peri_id; /* specific dma id */
 	enum pl330_reqtype rqtype;
-
-	/* For M->D and D->M Channels */
-	int burst_sz; /* in power of 2 */
-	dma_addr_t fifo_addr;
 };

 struct dma_pl330_platdata {