diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
| commit | 212b66016120fa4cd3b8f7edbe4c9f106032884e (patch) | |
| tree | f956cd9195952c7890493897a9c2108a8ee852d7 /drivers/video/bus_vcxk.c | |
| parent | b31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9 (diff) | |
| parent | 64d16706a052553c85d2f8f4c741879a4e3e6116 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/video/bus_vcxk.c')
| -rw-r--r-- | drivers/video/bus_vcxk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c index 60a5cc5b71..2f54d3d147 100644 --- a/drivers/video/bus_vcxk.c +++ b/drivers/video/bus_vcxk.c @@ -358,7 +358,7 @@ void vcxk_draw_mono(unsigned char *dataptr, unsigned long linewidth, int vcxk_display_bitmap(ulong addr, int x, int y) { - bmp_image_t *bmp; + struct bmp_image *bmp; unsigned long width; unsigned long height; unsigned long bpp; @@ -369,7 +369,7 @@ int vcxk_display_bitmap(ulong addr, int x, int y) unsigned long c_height; unsigned char *dataptr; - bmp = (bmp_image_t *) addr; + bmp = (struct bmp_image *)addr; if ((bmp->header.signature[0] == 'B') && (bmp->header.signature[1] == 'M')) { width = le32_to_cpu(bmp->header.width); |