board/[k-z]*: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

[u-boot] / board / netta / netta.c

diff --git a/board/netta/netta.c b/board/netta/netta.c
index 4923e3addafbfce87b9e7a41e4c606d1bec4cd03..11a6d56aeaf749ab84d4713d48a2f8c3c75dc93b 100644 (file)
--- a/board/netta/netta.c
+++ b/board/netta/netta.c
@@ -555,7 +555,7 @@ int board_early_init_f(void)
        return 0;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY)
 
 #include <linux/mtd/nand_legacy.h>
 
@@ -570,7 +570,7 @@ void nand_init(void)
 }
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
 
 int pcmcia_init(void)
 {