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

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

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index f1cdc4019eb7bfeffbaf4485ff46c5687891c6cf..1867eb66d65281e1a88e1b9a6e4fbe4419a8cc0f 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -121,7 +121,7 @@
 #define CONFIG_CMD_USB
 
 #undef CONFIG_CMD_NET
-
+#undef CONFIG_CMD_NFS
 
 /*
  * Autobooting
@@ -189,7 +189,6 @@
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
 #define CONFIG_SYS_HUSH_PARSER         1       /* use "hush" command parser    */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
  * IPB Bus clocking configuration.