summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-08-11 01:35:19 +0200
committerBen Dooks <ben-linux@fluff.org>2010-08-11 01:35:19 +0200
commitc09202ac143eabdafe246a7e3e9ddba1fb35352a (patch)
tree3f68ae3edce08546b0d22674488abff1c4c271e1 /drivers/i2c
parentMerge branch 'davinci-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/k... (diff)
parenti2c-pxa: fix compiler warning, due to missing const (diff)
downloadlinux-c09202ac143eabdafe246a7e3e9ddba1fb35352a.tar.xz
linux-c09202ac143eabdafe246a7e3e9ddba1fb35352a.zip
Merge branch 'for-2636/i2c/pxa' into next-i2c
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 020ff23d762f..c94e51b2651e 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1001,7 +1001,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
struct pxa_i2c *i2c;
struct resource *res;
struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
- struct platform_device_id *id = platform_get_device_id(dev);
+ const struct platform_device_id *id = platform_get_device_id(dev);
int ret;
int irq;