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

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

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 6f4d187595b1b08a3e15cf8e1d17150b6f01d61b..eb0233bef2795a1e81a0065b0b8e7d02b503dad5 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -261,7 +261,6 @@
 /*
  * Ethernet configuration
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT 5
 
 #define CONFIG_E1000
@@ -275,7 +274,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #undef         CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT              "=> "
 #ifdef CONFIG_CMD_KGDB