Merge git://www.denx.de/git/u-boot-marvell
diff --git a/common/cli.c b/common/cli.c
index 5e17da8..18d7e19 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -218,7 +218,7 @@
 	parse_file_outer();
 	/* This point is never reached */
 	for (;;);
-#elif defined(CONFIG_CMDINE)
+#elif defined(CONFIG_CMDLINE)
 	cli_simple_loop();
 #else
 	printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");