| commit | c09202ac143eabdafe246a7e3e9ddba1fb35352a | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Wed Aug 11 00:35:19 2010 +0100 |
| committer | Ben Dooks <ben-linux@fluff.org> | Wed Aug 11 00:35:19 2010 +0100 |
| tree | 3f68ae3edce08546b0d22674488abff1c4c271e1 | |
| parent | e126613e67873178f3c6f7c8674e70aa4327d8cd [diff] | |
| parent | 21e2ecfe19df8f28408b5a607fef8704f51fa7f8 [diff] |
Merge branch 'for-2636/i2c/pxa' into next-i2c
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 020ff23..c94e51b 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1001,7 +1001,7 @@ 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;