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

mariux64 · Aug 10, 2010 · c09202a · c09202a
2 parents e126613 + 21e2ecf
commit c09202a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;