diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
| commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
| tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /common/cmd_doc.c | |
| parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
| parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
| download | u-boot-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.gz u-boot-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.xz u-boot-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip | |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
Diffstat (limited to 'common/cmd_doc.c')
| -rw-r--r-- | common/cmd_doc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_doc.c b/common/cmd_doc.c index 4e624a2f3f..a172b3b68c 100644 --- a/common/cmd_doc.c +++ b/common/cmd_doc.c @@ -19,7 +19,7 @@ # define SHOW_BOOT_PROGRESS(arg) #endif -#if (CONFIG_COMMANDS & CFG_CMD_DOC) +#if defined(CONFIG_CMD_DOC) #include <linux/mtd/nftl.h> #include <linux/mtd/doc2000.h> @@ -1615,4 +1615,4 @@ void doc_probe(unsigned long physadr) } } -#endif /* (CONFIG_COMMANDS & CFG_CMD_DOC) */ +#endif |