From: Albert ARIBAUD Date: Mon, 28 Jul 2014 08:12:45 +0000 (+0200) Subject: Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master' X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=740f41d3cbefe2068247852220226c2c3b287249;p=u-boot.git Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master' --- 740f41d3cbefe2068247852220226c2c3b287249 diff --cc drivers/i2c/Makefile index 96bd45d853,61e9f3c240..416ea4f2c8 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@@ -18,8 -17,8 +17,9 @@@ obj-$(CONFIG_SYS_I2C) += i2c_core. obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o obj-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o +obj-$(CONFIG_SYS_I2C_IHS) += ihs_i2c.o obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o + obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o obj-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o obj-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o