summaryrefslogtreecommitdiff
path: root/include/linux/amba
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2011-09-21 11:53:30 +0530
committerVinod Koul <vinod.koul@intel.com>2011-09-21 11:53:30 +0530
commit0745c9a5e3b64ee03784bc58ba5b127418d78b4e (patch)
tree479961da88a62ad5e7a2cf8292be271b89fcd50d /include/linux/amba
parentf8de8f4ce2a83ccf7571ee13d41d02a9040797f9 (diff)
parent51ddf31da16b1ab9da861eafedad6d263faf4388 (diff)
Merge branch 'samsung_dma' into next
Diffstat (limited to 'include/linux/amba')
-rw-r--r--include/linux/amba/pl330.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index cbee7de7dd36..d12f077a6daf 100644
--- 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 {