diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
| commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
| tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /common/cmd_bmp.c | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
| download | olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.xz olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'common/cmd_bmp.c')
| -rw-r--r-- | common/cmd_bmp.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index ad412c81e..241aa8357 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -31,7 +31,7 @@  #include <asm/byteorder.h>  #include <malloc.h> -#if (CONFIG_COMMANDS & CFG_CMD_BMP) +#if defined(CONFIG_CMD_BMP)  static int bmp_info (ulong addr);  static int bmp_display (ulong addr, int x, int y); @@ -188,4 +188,4 @@ static int bmp_display(ulong addr, int x, int y)  #endif  } -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */ +#endif /* defined(CONFIG_CMD_BMP) */ |