Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  fsl_i2c: Fix compile warning

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 258be0a908ea73bbf9265057df6e2a20d7070be5..5b017a910cd7bbfd919cb5c3d8033a568302f91e 100644 (file)
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -225,7 +225,7 @@ unsigned int get_i2c_clock(int bus)
 void
 i2c_init(int speed, int slaveadd)
 {
-       struct fsl_i2c *dev;
+       const struct fsl_i2c *dev;
        unsigned int temp;
        int bus_num, i;