commit 479a4cfc15371abd1a4411866b64b1e563543f4f
author Heiko Schocher <hs@denx.de> Tue Jan 29 08:53:15 2013 +0100
committer Heiko Schocher <hs@denx.de> Tue Jul 23 05:54:29 2013 +0200
tree fbdedc80f785873f96e79893a1a813504af57580
parent e0e55bc8c2fad081e43641567f8494904cead0c3

i2c, soft-i2c: switch to new multibus/multiadapter support

- added to soft_i2c driver new multibus/multiadpater support
- adapted all config files, which uses this driver

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>

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 a9499b7..f0e84e6 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -144,7 +144,7 @@
  * I2C related stuff
  */
 #ifdef CONFIG_CMD_I2C
-#ifndef CONFIG_SOFT_I2C
+#ifndef CONFIG_SYS_I2C_SOFT
 #define CONFIG_I2C_MVTWSI
 #endif
 #define CONFIG_SYS_I2C_SLAVE		0x0