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

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

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 885d42b337ef2c0c50e114de6636cd90c232985a..1daec6967780ce4863b583b8cef832eb23603df3 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -52,7 +52,6 @@
 #define        CONFIG_PHY_ADDR         1       /* PHY address; handling of ENET */
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* early setup for 405gp */
 #define CONFIG_MISC_INIT_R     1       /* so that a misc_init_r() is called */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_CONS_INDEX      1       /* Use UART0                    */
 #define CONFIG_SYS_NS16550
@@ -88,7 +87,6 @@
 #define CONFIG_ENV_OVERWRITE     1
 #define        CONFIG_SYS_HZ                        1000       /* decrementer freq: 1 ms ticks */
 #define CONFIG_SYS_HUSH_PARSER                 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2             "> "
 #define CONFIG_SOURCE                  1