summaryrefslogtreecommitdiff
path: root/include/pcmcia.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:03:34 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:35:14 +0200
commit72a074cec68e5bad60d63206c050974e08afd804 (patch)
tree27f9387a104c89364d5897490e3be82df2e67d7c /include/pcmcia.h
parent5fcf543e0b6628c76ff48705b1b0566bfd11507b (diff)
downloadu-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.zip
u-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.tar.gz
u-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.tar.bz2
include/ non-config: 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 'include/pcmcia.h')
-rw-r--r--include/pcmcia.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h
index 8f564da..60794f9 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -31,8 +31,8 @@
* Allow configuration to select PCMCIA slot,
* or try to generate a useful default
*/
-#if ( CONFIG_COMMANDS & CFG_CMD_PCMCIA) || \
- ((CONFIG_COMMANDS & CFG_CMD_IDE) && \
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) || \
+ (((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && \
(defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
#if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
@@ -313,7 +313,7 @@ extern u_int *pcmcia_pgcrx[];
#define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot])
#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) \
|| defined(CONFIG_PXA_PCMCIA)
extern int check_ide_device(int slot);
#endif