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

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

diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index cd7148df1537b1872ed7f0011799cef3ee92ab2b..4703d9d9b016806f8be72399b07d510be29a84e5 100644 (file)
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -128,7 +128,6 @@ extern void out32(unsigned int, unsigned long);
  * Use the HUSH parser
  */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
  * NOR flash configuration
@@ -183,7 +182,6 @@ extern void out32(unsigned int, unsigned long);
  */
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_PHY_RESET       1       /* reset phy upon startup */
 #define CONFIG_SYS_RX_ETH_BUFFER 32    /* Number of ethernet rx buffers & descriptors */