Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / include / configs / netstal-common.h

diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h
index 4d5c1ab3435b09bc8136e7329be6f75120cdb9eb..cb7efe7abca7ee867bc1ccd6091b63ec2687dad3 100644 (file)
--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@@ -42,6 +42,7 @@
  * I2C
  */
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
@@ -61,8 +62,8 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
-#if defined(CONFIG_440)
 #define CONFIG_NET_MULTI       1
+#if defined(CONFIG_440)
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* number of eth rx buffers     */
 #else