Merge git://www.denx.de/git/u-boot

2007-08-07 22:12:05 +02:00
parent 706714d97a b23b547597
commit 85fad497b3
1276 changed files with 30092 additions and 120001 deletions
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -30,7 +30,7 @@
 #include <config.h>
 #include <command.h>

-#if (CONFIG_COMMANDS & CFG_CMD_MFSL)
+#if defined(CONFIG_CMD_MFSL)
 #include <asm/asm.h>

 int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -415,4 +415,4 @@ U_BOOT_CMD (rspr, 3, 1, do_rspr,
 		" 3 - EAR - Exception address register\n"
 		" 5 - ESR - Exception status register\n");

-#endif				/* CONFIG_MICROBLAZE & CFG_CMD_MFSL */
+#endif