Merge: Add support for AMCC 440SPe CPU based eval board (Yucca).

[oweals/u-boot.git] / drivers / nand / nand.c

diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c
index bc85005b2af28429898691143ca2a13ee4e2da0b..e1781fcbbf85b3c3b98ba997b1b0f0873d8b66c4 100644 (file)
--- a/drivers/nand/nand.c
+++ b/drivers/nand/nand.c
@@ -23,8 +23,7 @@
 
 #include <common.h>
 
-#ifdef CONFIG_NEW_NAND_CODE
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <nand.h>
 
@@ -72,5 +71,3 @@ void nand_init(void)
 }
 
 #endif
-#endif /* CONFIG_NEW_NAND_CODE */
-