summaryrefslogtreecommitdiffstats
path: root/disk/part_mac.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:02:34 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:13 +0200
commit45cdb9b72c94655c7308b464a2666057c0b286e0 (patch)
tree6ffbd54343f18c39be6530a2e2464437ecc59300 /disk/part_mac.c
parent4e109ae98294a5ca7ff848b7652c7bfd4023a94a (diff)
downloadbootable_bootloader_goldelico_gta04-45cdb9b72c94655c7308b464a2666057c0b286e0.zip
bootable_bootloader_goldelico_gta04-45cdb9b72c94655c7308b464a2666057c0b286e0.tar.gz
bootable_bootloader_goldelico_gta04-45cdb9b72c94655c7308b464a2666057c0b286e0.tar.bz2
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>
Diffstat (limited to 'disk/part_mac.c')
-rw-r--r--disk/part_mac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/disk/part_mac.c b/disk/part_mac.c
index 8c23e21..441f03b 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -34,9 +34,9 @@
#include <ide.h>
#include "part_mac.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_MAC_PARTITION)