projects
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-kirkwood
/
config.h
diff --git
a/arch/arm/include/asm/arch-kirkwood/config.h
b/arch/arm/include/asm/arch-kirkwood/config.h
index
78d1441
..
197703b
100644
(file)
--- a/
arch/arm/include/asm/arch-kirkwood/config.h
+++ b/
arch/arm/include/asm/arch-kirkwood/config.h
@@
-128,7
+128,7
@@
* I2C related stuff
*/
#ifdef CONFIG_CMD_I2C
-#ifndef CONFIG_S
OFT_I2C
+#ifndef CONFIG_S
YS_I2C_SOFT
#define CONFIG_I2C_MVTWSI
#endif
#define CONFIG_SYS_I2C_SLAVE 0x0