diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-15 20:16:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-15 20:16:02 -0400 |
| commit | d09ec7f81650425140776995fc9752189ddf7956 (patch) | |
| tree | f8de42cc54511ff75ef5b4d2a695be25a1d0b070 /drivers/video/video_bmp.c | |
| parent | cb33bda44f4bbf6fb58adf41dced313ca38da6fc (diff) | |
| parent | 940aed8f6bacfc8c0dbaf9da0008e0a6a76463a8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video/video_bmp.c')
| -rw-r--r-- | drivers/video/video_bmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 32a4e7f8a9..f803067da3 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -316,7 +316,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, } break; #endif /* CONFIG_BMP_16BPP */ -#if defined(CONFIG_BMP_24BMP) +#if defined(CONFIG_BMP_24BPP) case 24: for (i = 0; i < height; ++i) { for (j = 0; j < width; j++) { @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, fb -= priv->line_length + width * (bpix / 8); } break; -#endif /* CONFIG_BMP_24BMP */ +#endif /* CONFIG_BMP_24BPP */ #if defined(CONFIG_BMP_32BPP) case 32: for (i = 0; i < height; ++i) { |