Skip to contentSkip to conversation

OMAP3: Fix I2C driver merge error

U-Boot Dirk Behme 2 participants 2 messages Nov 27, 2008 I2C

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

Fix merge error.

---
 drivers/i2c/omap24xx_i2c.c |    1 +
 1 files changed, 1 insertion(+)
drivers/i2c/omap24xx_i2c.c +1 -0
Index: 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) {