Merge branch 'next'

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

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 692f0ec77a69b71cbcf6b4d5251e0f16275f23a9..8d78921f6b560a46c67a348a9b78d8d57df99e6e 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -67,7 +67,6 @@
 #define CONFIG_ETHER_ON_FCC            /* Ethernet is on FCC     */
 #undef CONFIG_ETHER_NONE               /* No external Ethernet   */
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_ETHER_ON_FCC2
 #define CONFIG_ETHER_ON_FCC3
@@ -166,7 +165,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory     */
 #define CONFIG_SYS_PROMPT              "ep82xxm=> "    /* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)