summaryrefslogtreecommitdiff
path: root/common/cmd_ext2.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:01:43 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:08 +0200
commita76adc8142c1d956385a109e0b70f9319ede4d66 (patch)
treeaf5cd7bc45acf37dbcb217a42523c66e05a811c7 /common/cmd_ext2.c
parentec63b10b61fd68238d4c15c1cd04c0b38228e2c1 (diff)
downloadu-boot-imx-a76adc8142c1d956385a109e0b70f9319ede4d66.zip
u-boot-imx-a76adc8142c1d956385a109e0b70f9319ede4d66.tar.gz
u-boot-imx-a76adc8142c1d956385a109e0b70f9319ede4d66.tar.bz2
common/cmd_[a-f]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'common/cmd_ext2.c')
-rw-r--r--common/cmd_ext2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 94bd9b6..d0999ac 100644
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -35,14 +35,14 @@
#include <common.h>
#include <part.h>
-#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
+#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#include <config.h>
#include <command.h>
#include <image.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <ext2fs.h>
-#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE))
+#if (((CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)) && defined(CONFIG_USB_STORAGE))
#include <usb.h>
#endif