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

[karo-tx-uboot.git] / drivers / nand / nand_ids.c

diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c
index 39882cc76b24b8e59a853047bcfbd9952c888345..d3553261073759edd943f6cc30f96f6ef6e62768 100644 (file)
--- a/drivers/nand/nand_ids.c
+++ b/drivers/nand/nand_ids.c
@@ -10,8 +10,10 @@
  * published by the Free Software Foundation.
  *
  */
+
 #include <common.h>
 
+#ifdef CONFIG_NEW_NAND_CODE
 #if (CONFIG_COMMANDS & CFG_CMD_NAND)
 
 #include <linux/mtd/nand.h>
@@ -125,3 +127,5 @@ struct nand_manufacturers nand_manuf_ids[] = {
        {0x0, "Unknown"}
 };
 #endif
+#endif /* CONFIG_NEW_NAND_CODE */
+