Merge branch 'u-boot/master' into u-boot-arm/master

[u-boot] / include / configs / aria.h

diff --git a/include/configs/aria.h b/include/configs/aria.h
index c9d090e000bdaafb384735d76bd9e1fb4f2e8207..68f25ea388cb8fd9fa0c2c3c1137197d5f0296ee 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -355,7 +355,6 @@
 
 /* I2C */
 #define CONFIG_HARD_I2C                        /* I2C with hardware support */
-#undef CONFIG_SOFT_I2C                 /* so disable bit-banged I2C */
 #define CONFIG_I2C_MULTI_BUS
 
 /* I2C speed and slave address */