diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
commit | 740f41d3cbefe2068247852220226c2c3b287249 (patch) | |
tree | a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 /arch/arm/include/asm/arch-kirkwood/config.h | |
parent | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (diff) | |
parent | 7c48b015100eeff0e1bbb766394f7beca23afb48 (diff) | |
download | talos-obmc-uboot-740f41d3cbefe2068247852220226c2c3b287249.tar.gz talos-obmc-uboot-740f41d3cbefe2068247852220226c2c3b287249.zip |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-kirkwood/config.h')
-rw-r--r-- | arch/arm/include/asm/arch-kirkwood/config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index 7a688e46b0..f7bfa0e74d 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -129,7 +129,8 @@ */ #ifdef CONFIG_CMD_I2C #ifndef CONFIG_SYS_I2C_SOFT -#define CONFIG_I2C_MVTWSI +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MVTWSI #endif #define CONFIG_SYS_I2C_SLAVE 0x0 #define CONFIG_SYS_I2C_SPEED 100000 |