aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-05-17 10:14:59 +0530
committerVinod Koul <vinod.koul@intel.com>2016-05-17 10:14:59 +0530
commit4dc50060c9fe68db800b14b2996de7ab88240986 (patch)
treee5ca8878a128ffa12390dae5553e4b73fa3ff3f9 /include
parentMerge branch 'topic/mv_xor' into for-linus (diff)
parentdmaengine: pl08x: allocate OF slave channel data at probe time (diff)
downloadlinux-dev-4dc50060c9fe68db800b14b2996de7ab88240986.tar.xz
linux-dev-4dc50060c9fe68db800b14b2996de7ab88240986.zip
Merge branch 'topic/pl08x' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/amba/pl08x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 10fe2a211c2e..27e9ec8778eb 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -86,7 +86,7 @@ struct pl08x_channel_data {
* @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2
*/
struct pl08x_platform_data {
- const struct pl08x_channel_data *slave_channels;
+ struct pl08x_channel_data *slave_channels;
unsigned int num_slave_channels;
struct pl08x_channel_data memcpy_channel;
int (*get_xfer_signal)(const struct pl08x_channel_data *);