projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
drivers
/
tsi108_i2c.c
diff --git
a/drivers/tsi108_i2c.c
b/drivers/tsi108_i2c.c
index
eb52cb6
..
3a3b75c
100644
(file)
--- a/
drivers/tsi108_i2c.c
+++ b/
drivers/tsi108_i2c.c
@@
-28,7
+28,7
@@
#ifdef CONFIG_TSI108_I2C
#include <tsi108.h>
#ifdef CONFIG_TSI108_I2C
#include <tsi108.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_I2C)
+#if
defined(CONFI
G_CMD_I2C)
#define I2C_DELAY 100000
#undef DEBUG_I2C
#define I2C_DELAY 100000
#undef DEBUG_I2C
@@
-279,5
+279,5
@@
int i2c_probe (uchar chip)
return i2c_read (chip, 0, 1, (char *)&tmp, 1);
}
return i2c_read (chip, 0, 1, (char *)&tmp, 1);
}
-#endif
/* (CONFIG_COMMANDS & CFG_CMD_I2C) */
+#endif
#endif /* CONFIG_TSI108_I2C */
#endif /* CONFIG_TSI108_I2C */