From 6267f6b443fe1a6e54aedeaa6b1fb03964b6ce3b Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Mon, 3 Jan 2011 22:35:08 +0000 Subject: [PATCH] --- yaml --- r: 231579 b: refs/heads/master c: f96ca9ec27159c1c8718aa8d0ed03051cd12e884 h: refs/heads/master i: 231577: c155f9df51db63d52cad53d52a48235fb50866b4 231575: 5c069e82558a9f188111ed0f31577531843173bc v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc467fa41f7a..62056597019b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b58b6b5bedf4d5da7a0cb2dce3b42d010c3aef03 +refs/heads/master: f96ca9ec27159c1c8718aa8d0ed03051cd12e884 diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c index 74b35910f295..707fa081c9fa 100644 --- a/trunk/drivers/dma/amba-pl08x.c +++ b/trunk/drivers/dma/amba-pl08x.c @@ -132,7 +132,7 @@ struct pl08x_driver_data { struct dma_device memcpy; void __iomem *base; struct amba_device *adev; - struct vendor_data *vd; + const struct vendor_data *vd; struct pl08x_platform_data *pd; struct pl08x_phy_chan *phy_chans; struct dma_pool *pool; @@ -1891,7 +1891,7 @@ static inline void init_pl08x_debugfs(struct pl08x_driver_data *pl08x) static int pl08x_probe(struct amba_device *adev, struct amba_id *id) { struct pl08x_driver_data *pl08x; - struct vendor_data *vd = id->data; + const struct vendor_data *vd = id->data; int ret = 0; int i;