summaryrefslogtreecommitdiffstats
path: root/common/cmd_doc.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-06 01:11:08 +0200
committerWolfgang Denk <wd@denx.de>2007-08-06 01:11:08 +0200
commitf2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch)
treefa8f7c9fb65d10259e76c40c52cf8277947424d4 /common/cmd_doc.c
parentb1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff)
parent5728be389e65fd47f34b33c2596271eb4db751ae (diff)
downloadtalos-obmc-uboot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.gz
talos-obmc-uboot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'common/cmd_doc.c')
-rw-r--r--common/cmd_doc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index 9814d754fb..d6d3aff8c8 100644
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -12,7 +12,7 @@
#include <malloc.h>
#include <asm/io.h>
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
#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
OpenPOWER on IntegriCloud