diff options
author | Stefan Roese <sr@denx.de> | 2007-08-15 14:51:27 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-15 14:51:27 +0200 |
commit | d61ea14885631e58a25feaa81ee82eb464c62d6a (patch) | |
tree | 27927975039d0a15e6c6d4dfe8f765a76a12820a /board/genietv/genietv.c | |
parent | 3ba4c2d68f6541db4677b4aea12071f56e6ff6e6 (diff) | |
parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
download | u-boot-d61ea14885631e58a25feaa81ee82eb464c62d6a.tar.gz u-boot-d61ea14885631e58a25feaa81ee82eb464c62d6a.tar.xz u-boot-d61ea14885631e58a25feaa81ee82eb464c62d6a.zip |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/genietv/genietv.c')
-rw-r--r-- | board/genietv/genietv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c index 5f8c8997e5..c75507f61d 100644 --- a/board/genietv/genietv.c +++ b/board/genietv/genietv.c @@ -267,7 +267,7 @@ static long int dram_size (long int mbmr_value, long int *base, return (size); } -#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; @@ -357,4 +357,4 @@ int pcmcia_init (void) return 0; } -#endif /* CFG_CMD_PCMCIA */ +#endif |