Merge branch 'next' of ../master

[platform/kernel/u-boot.git] / include / configs / csb272.h

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 5d3b09a..aed6f50 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -140,7 +140,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x0C00000 /* 4 ... 12 MB in DRAM */
 
 #define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
-#define CONFIG_SYS_CLKS_IN_HZ          1       /* everything, incl board info, in Hz */
 #define CONFIG_SYS_EXTBDINFO           1       /* To use extended board_info (bd_t) */
 #define CONFIG_SYS_LOAD_ADDR           0x100000 /* default load address */
 
@@ -185,6 +184,7 @@
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */
                                        /* 32usec min. for LXT971A      */
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
+#define CONFIG_NET_MULTI
 
 /*
  * RTC configuration