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

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

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index ce30f55db2c5017e663492698fe3a734689a5770..832dd426b6ebc518894f7375fca7d884ffbe4796 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -58,7 +58,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
@@ -136,8 +137,8 @@
  * DPLL1. This time is further subdivided by a local divisor.
  */
 #define CONFIG_SYS_TIMERBASE   0xFFFEC500      /* use timer 1 */
-#define CONFIG_SYS_PVT 7       /* 2^(pvt+1), divide by 256 */
-#define CONFIG_SYS_HZ  ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT))
+#define CONFIG_SYS_PTV         7       /* 2^(PTV+1), divide by 256 */
+#define CONFIG_SYS_HZ          ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
 
 /*-----------------------------------------------------------------------
  * Stack sizes