diff options
author | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
commit | 85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch) | |
tree | 3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /board/cpc45/cpc45.c | |
parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
download | u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.gz u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.bz2 |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/cpc45/cpc45.c')
-rw-r--r-- | board/cpc45/cpc45.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 51b0085..79eb473 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -240,7 +240,7 @@ int sysControlDisplay (int digit, /* number of digit 0..7 */ return (0); } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if defined(CONFIG_CMD_PCMCIA) #ifdef CFG_PCMCIA_MEM_ADDR volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR; @@ -257,7 +257,7 @@ int pcmcia_init(void) return rc; } -#endif /* CFG_CMD_PCMCIA */ +#endif # ifdef CONFIG_IDE_LED void ide_led (uchar led, uchar status) |