commit 3de8b240530ba1ed8cf735a977ab3973b98813db
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:01:54 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:09 2007 +0200
tree 1cd6a7f845d4522d9169e2c941a8919c80cf50d3
parent 8692c606c66186017f8e04a4d3de7be178249474

common/cmd_[i-z]* : 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>

common/cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 904df71..529938f 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -30,7 +30,7 @@
 #include <asm/byteorder.h>
 #include <part.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
 
 #include <usb.h>
 
@@ -612,7 +612,7 @@
 #endif /* (CONFIG_COMMANDS & CFG_CMD_USB) */
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
 
 #ifdef CONFIG_USB_STORAGE
 U_BOOT_CMD(