Merge git://git.denx.de/u-boot-dm

2014-12-11 20:47:34 -05:00
parent fc9b0b8043 b0e6ef4640
commit a5a5882611
73 changed files with 3347 additions and 503 deletions
--- a/arch/arm/include/asm/arch-tegra/tegra_i2c.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_i2c.h
@@ -167,6 +167,6 @@ struct i2c_ctlr {
 *
 * @return number of bus, or -1 if there is no DVC active
 */
-int tegra_i2c_get_dvc_bus_num(void);
+int tegra_i2c_get_dvc_bus(struct udevice **busp);

 #endif	/* _TEGRA_I2C_H_ */