forked from luck/tmp_suning_uos_patched
Merge branch 'for-2636/i2c/pxa' into next-i2c
This commit is contained in:
commit
c09202ac14
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user