summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/mv_i2c.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-18 07:07:36 -0400
committerTom Rini <trini@konsulko.com>2015-03-18 07:07:36 -0400
commit8c8dc4c61518124eb35f4dd9d8466378ba247e9c (patch)
tree005649bad56752594455498ba3830623368b8dcb /drivers/i2c/mv_i2c.c
parentd283a5709d8e2bf2682a2e22fb81a47b8d53c111 (diff)
parentf582a1583b2c7ae91737f3b1a0b850e7f4ef68bb (diff)
downloadtalos-obmc-uboot-8c8dc4c61518124eb35f4dd9d8466378ba247e9c.tar.gz
talos-obmc-uboot-8c8dc4c61518124eb35f4dd9d8466378ba247e9c.zip
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers/i2c/mv_i2c.c')
-rw-r--r--drivers/i2c/mv_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index e65cce0d8e..fc02e65504 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -73,7 +73,7 @@ static void i2c_board_init(struct mv_i2c *base)
}
#ifdef CONFIG_I2C_MULTI_BUS
-static u32 i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
+static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
static unsigned int current_bus;
OpenPOWER on IntegriCloud