diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-08-07 22:30:29 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-08-07 22:30:29 +0200 |
| commit | 78549bbf44bd2c8d1a0730fb068836071751afaa (patch) | |
| tree | 92f002dc9772874bc3c884b1caa5607763c2c276 /board/fads/pcmcia.c | |
| parent | 9b7464a2c88614e1061f509c48930a3d240d1a35 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| download | u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.zip u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.gz u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/fads/pcmcia.c')
| -rw-r--r-- | board/fads/pcmcia.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/fads/pcmcia.c b/board/fads/pcmcia.c index 978c16b..57a2454 100644 --- a/board/fads/pcmcia.c +++ b/board/fads/pcmcia.c @@ -4,11 +4,11 @@ #undef CONFIG_PCMCIA -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif -#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif @@ -73,12 +73,12 @@ int pcmcia_hardware_enable(int slot) return 0; } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { *((uint *)BCSR1) &= ~BCSR1_PCCEN; return 0; } -#endif /* CFG_CMD_PCMCIA */ +#endif #endif /* CONFIG_PCMCIA */ |