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_base.c
diff --git
a/drivers/nand/nand_base.c
b/drivers/nand/nand_base.c
index
c6fee18
..
151f535
100644
(file)
--- a/
drivers/nand/nand_base.c
+++ b/
drivers/nand/nand_base.c
@@
-72,7
+72,7
@@
#include <common.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND) && !defined(CFG_NAND_LEGACY)
+#if
defined(CONFI
G_CMD_NAND) && !defined(CFG_NAND_LEGACY)
#include <malloc.h>
#include <watchdog.h>