summaryrefslogtreecommitdiff
path: root/drivers/rpx_pcmcia.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:02:10 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:11 +0200
commitd5be43de93ff905c465e509d45a3164ef48d26e7 (patch)
tree8adf5e095118afadc4b2f770daad386df1da3f4e /drivers/rpx_pcmcia.c
parentb453960d4fdb87b3970d96119b90df2ed024fc4a (diff)
downloadu-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.zip
u-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.tar.gz
u-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.tar.bz2
drivers/: 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 'drivers/rpx_pcmcia.c')
-rw-r--r--drivers/rpx_pcmcia.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rpx_pcmcia.c b/drivers/rpx_pcmcia.c
index 2a0a9e0..530525d 100644
--- a/drivers/rpx_pcmcia.c
+++ b/drivers/rpx_pcmcia.c
@@ -9,11 +9,11 @@
#undef CONFIG_PCMCIA
-#if CONFIG_COMMANDS & CFG_CMD_PCMCIA
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
@@ -62,7 +62,7 @@ int pcmcia_hardware_enable (int slot)
return 0; /* No hardware to enable */
}
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
static int pcmcia_hardware_disable(int slot)
{
return 0; /* No hardware to disable */