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]
/
common
/
cmd_doc.c
diff --git
a/common/cmd_doc.c
b/common/cmd_doc.c
index
9814d75
..
d6d3aff
100644
(file)
--- a/
common/cmd_doc.c
+++ b/
common/cmd_doc.c
@@
-12,7
+12,7
@@
#include <malloc.h>
#include <asm/io.h>
#include <malloc.h>
#include <asm/io.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_DOC)
+#if
defined(CONFI
G_CMD_DOC)
#include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h>
#include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h>
@@
-1608,4
+1608,4
@@
void doc_probe(unsigned long physadr)
}
}
}
}
-#endif
/* (CONFIG_COMMANDS & CFG_CMD_DOC) */
+#endif