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

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

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 3154e13f2f32c4ca159c75733b7fe35469ac2403..ca415e432b9afcaeae29caa28215a96e7fff6396 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -106,7 +106,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
@@ -626,7 +625,6 @@
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define CONFIG_SYS_CACHELINE_SIZE      32      /* For MPC5xxx CPUs */
 #if defined(CONFIG_CMD_KGDB)