projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
drivers
/
nand
/
nand_ids.c
diff --git
a/drivers/nand/nand_ids.c
b/drivers/nand/nand_ids.c
index
3d4d372
..
075cae6
100644
(file)
--- a/
drivers/nand/nand_ids.c
+++ b/
drivers/nand/nand_ids.c
@@
-13,11
+13,7
@@
#include <common.h>
#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 <linux/mtd/nand.h>
#include <linux/mtd/nand.h>