diff options
| author | Tom Rini <trini@ti.com> | 2012-11-19 09:28:04 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-19 09:28:04 -0700 |
| commit | 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1 (patch) | |
| tree | f4ccb38889b6ae9d2092b8ce43b8f6d422c900cb /common/cmd_bmp.c | |
| parent | bb367b95f9204115bd6eac82e839b5590e6da4eb (diff) | |
| parent | 30ea4be921634de193236355f76e7870f1a3cb89 (diff) | |
| download | u-boot-imx-178d0cc1a4c73c3341afbeb2a93b172de8c96bd1.zip u-boot-imx-178d0cc1a4c73c3341afbeb2a93b172de8c96bd1.tar.gz u-boot-imx-178d0cc1a4c73c3341afbeb2a93b172de8c96bd1.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common/cmd_bmp.c')
| -rw-r--r-- | common/cmd_bmp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index b8809e3..5a52edd 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -31,6 +31,7 @@ #include <command.h> #include <asm/byteorder.h> #include <malloc.h> +#include <video.h> static int bmp_info (ulong addr); @@ -238,9 +239,7 @@ int bmp_display(ulong addr, int x, int y) #if defined(CONFIG_LCD) ret = lcd_display_bitmap((ulong)bmp, x, y); #elif defined(CONFIG_VIDEO) - extern int video_display_bitmap (ulong, int, int); - - ret = video_display_bitmap ((unsigned long)bmp, x, y); + ret = video_display_bitmap((unsigned long)bmp, x, y); #else # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO #endif |