summaryrefslogtreecommitdiff
path: root/board/sixnet/sixnet.c
diff options
context:
space:
mode:
Diffstat (limited to 'board/sixnet/sixnet.c')
-rw-r--r--board/sixnet/sixnet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index d6a26f449..41c74f6a6 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -33,7 +33,7 @@
# include <status_led.h>
#endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
#endif
@@ -75,7 +75,7 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
#error "SXNI855T has no PCMCIA port"
#endif /* CFG_CMD_PCMCIA */
@@ -327,7 +327,7 @@ int misc_init_r (void)
return (0);
}
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
void nand_init(void)
{
unsigned long totlen = nand_probe(CFG_DFLASH_BASE);