Merge ../u-boot

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

diff --git a/drivers/nand/nand_bbt.c b/drivers/nand/nand_bbt.c
index ac168723e22c2cd532059c9bc5ee586ea3ace4bd..19a9bc2a5b6cdc6469118545fa2fdc0cfd80f5d0 100644 (file)
--- a/drivers/nand/nand_bbt.c
+++ b/drivers/nand/nand_bbt.c
@@ -54,11 +54,7 @@
 
 #include <common.h>
 
-#ifdef CFG_NAND_LEGACY
-#error CFG_NAND_LEGACY defined in a file not using the legacy NAND support!
-#endif
-
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <malloc.h>
 #include <linux/mtd/compat.h>