From d7915bdb23bcf2569cd69cd8759e1b718416b5a4 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Thu, 21 Jul 2011 17:13:07 +0100 Subject: [PATCH] --- yaml --- r: 262055 b: refs/heads/master c: fa020e7d046436cb6642b23dc95012a3064d77e2 h: refs/heads/master i: 262053: 15f0c392446e9a3badb92f1b48958d7b92a89b2c 262051: 068f34c4eb8c13cc16bd2382ba3b101a2d47580f 262047: 489ffd15b8a1273053068fc07120051135846963 v: v3 --- [refs] | 2 +- trunk/include/linux/amba/pl08x.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f68f717bda4d..d5ce1162c714 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f14c426c723634d223344ad820997d92a3e355b6 +refs/heads/master: fa020e7d046436cb6642b23dc95012a3064d77e2 diff --git a/trunk/include/linux/amba/pl08x.h b/trunk/include/linux/amba/pl08x.h index 47cfe31e5c35..e6e28f37d8ec 100644 --- a/trunk/include/linux/amba/pl08x.h +++ b/trunk/include/linux/amba/pl08x.h @@ -172,7 +172,7 @@ struct pl08x_dma_chan { int phychan_hold; struct tasklet_struct tasklet; char *name; - struct pl08x_channel_data *cd; + const struct pl08x_channel_data *cd; dma_addr_t src_addr; dma_addr_t dst_addr; u32 src_cctl; @@ -205,7 +205,7 @@ struct pl08x_dma_chan { * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2 */ struct pl08x_platform_data { - struct pl08x_channel_data *slave_channels; + const struct pl08x_channel_data *slave_channels; unsigned int num_slave_channels; struct pl08x_channel_data memcpy_channel; int (*get_signal)(struct pl08x_dma_chan *);