[U-Boot] [PATCH-OMAP3] OMAP3: Fix I2C driver merge error

Dirk Behme dirk.behme at googlemail.com
Thu Nov 27 06:20:47 CET 2008


Fix merge error.

Signed-off-by: Dirk Behme <dirk.behme at googlemail.com>

---
 drivers/i2c/omap24xx_i2c.c |    1 +
 1 files changed, 1 insertion(+)

Index: u-boot-arm/drivers/i2c/omap24xx_i2c.c
===================================================================
--- u-boot-arm.orig/drivers/i2c/omap24xx_i2c.c
+++ u-boot-arm/drivers/i2c/omap24xx_i2c.c
@@ -170,6 +170,7 @@ static int i2c_write_byte (u8 devaddr, u
 #else
 		/* send out two bytes */
 		writew ((value << 8) + regoffset, I2C_DATA);
+#endif
 		/* must have enough delay to allow BB bit to go low */
 		udelay (50000);
 		if (readw (I2C_STAT) & I2C_STAT_NACK) {


More information about the U-Boot mailing list