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

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

diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 0c2e7edb2388629180daa178ea47863b0e732f3a..dda665719bfef631acb8ee7e10690aa5637ead07 100644 (file)
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -236,7 +236,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
  * Pass open firmware flat tree
@@ -333,7 +332,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_TSEC_TBI
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */