commit e6e4e906f725412de5f83e718a89574eab3796d3
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:34 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:13 2007 +0200
tree 6ffbd54343f18c39be6530a2e2464437ecc59300
parent 32912ff276817c7e6f07abe522f9f4bd239a17b0

disk/: 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>

disk/part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 41e68fc..d55249f 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -26,9 +26,9 @@
 #include <ide.h>
 #include "part_amiga.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
-     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
-     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)	 || defined(CONFIG_CMD_IDE) || \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)	 || defined(CONFIG_CMD_SCSI) || \
+     (CONFIG_COMMANDS & CFG_CMD_USB)	 || defined(CONFIG_CMD_USB) || \
      defined(CONFIG_MMC) || \
      defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)