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

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

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index e23b0a1b2f25d0a75b1135c8f8ef34e6c60915db..1d89176f13e0e4eb6e02e2fab5af6c5a5a64dfe0 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -216,9 +216,6 @@
 #define CONFIG_SYS_PROMPT      "=> "           /* Monitor Command Prompt       */
 
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size      */
@@ -243,8 +240,6 @@
  */
 #ifdef CONFIG_WATCHDOG
 #define CONFIG_SYS_BAUDRATE_TABLE      {               38400, 57600, 115200 }
-#else
-#define CONFIG_SYS_BAUDRATE_TABLE      {  9600, 19200, 38400, 57600, 115200 }
 #endif
 
 /*----------------------------------------------------------------------*/