Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 6d9e2ad96a11a6e4e4035e91f044b2ec1fcb91c2..7321b60c2fb1f42ffc562bec883f51e8ca9d62d8 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -119,7 +119,7 @@
 
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* Size of one Flash sector */
-#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE    /* Use one Flash sector for enviroment  */
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE    /* Use one Flash sector for environment */
 #define CONFIG_ENV_ADDR                0xFFFC0000
 #define CONFIG_ENV_OFFSET              0       /* starting right at the beginning  */
 
@@ -208,7 +208,7 @@
  * configuration items that the driver uses to drive the port pins.
  */
 #define CONFIG_HARD_I2C                1       /* To enable I2C support        */
-#undef CONFIG_SOFT_I2C         /* I2C bit-banged               */
+#undef CONFIG_SYS_I2C_SOFT             /* I2C bit-banged               */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F