Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.

[platform/kernel/u-boot.git] / common / cmd_nand.c

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index b0c01d1..152873f 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -21,7 +21,7 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CONFIG_NEW_NAND_CODE)
 
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ids.h>