Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c09202ac authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'for-2636/i2c/pxa' into next-i2c

parents e126613e 21e2ecfe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;