diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-08-10 19:35:19 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-10 19:35:19 -0400 |
| commit | c09202ac143eabdafe246a7e3e9ddba1fb35352a (patch) | |
| tree | 3f68ae3edce08546b0d22674488abff1c4c271e1 /drivers/i2c | |
| parent | e126613e67873178f3c6f7c8674e70aa4327d8cd (diff) | |
| parent | 21e2ecfe19df8f28408b5a607fef8704f51fa7f8 (diff) | |
Merge branch 'for-2636/i2c/pxa' into next-i2c
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
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) | |||
| 1001 | struct pxa_i2c *i2c; | 1001 | struct pxa_i2c *i2c; |
| 1002 | struct resource *res; | 1002 | struct resource *res; |
| 1003 | struct i2c_pxa_platform_data *plat = dev->dev.platform_data; | 1003 | struct i2c_pxa_platform_data *plat = dev->dev.platform_data; |
| 1004 | struct platform_device_id *id = platform_get_device_id(dev); | 1004 | const struct platform_device_id *id = platform_get_device_id(dev); |
| 1005 | int ret; | 1005 | int ret; |
| 1006 | int irq; | 1006 | int irq; |
| 1007 | 1007 | ||