Add ability to take MAC address from the environment to DM9000 driver

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

diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c
index d3553261073759edd943f6cc30f96f6ef6e62768..075cae66b06eced8ad0ceace2c77c6a4e56080f8 100644 (file)
--- a/drivers/nand/nand_ids.c
+++ b/drivers/nand/nand_ids.c
@@ -13,8 +13,7 @@
 
 #include <common.h>
 
-#ifdef CONFIG_NEW_NAND_CODE
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <linux/mtd/nand.h>
 
@@ -127,5 +126,3 @@ struct nand_manufacturers nand_manuf_ids[] = {
        {0x0, "Unknown"}
 };
 #endif
-#endif /* CONFIG_NEW_NAND_CODE */
-