summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-07-17 20:49:59 +0200
committerWolfgang Denk <wd@denx.de>2010-07-17 20:49:59 +0200
commit1f82ff4777f360e92aa37bbbed647f7b9d9d2044 (patch)
tree2c9e46332357b4b1bbb2c16b397d22958fcacfc3
parent0fe247b973d9b8f7e2c04cc159fcdd2e64591e55 (diff)
parent7c050f818b51841de77fbfd077080d94f3c8b3ad (diff)
Merge branch 'master' of git://git.denx.de/u-boot-video
-rw-r--r--drivers/video/cfb_console.c6
-rw-r--r--include/video_fb.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 96d52fbaea..fae54177cb 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1119,7 +1119,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
case 8:
padded_line -= width;
if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
- /* Copy colormap */
+ /* Copy colormap */
for (xcount = 0; xcount < colors; ++xcount) {
cte = bmp->color_table[xcount];
video_set_lut (xcount, cte.red, cte.green, cte.blue);
@@ -1321,11 +1321,11 @@ void logo_plot (void *screen, int width, int x, int y)
#ifdef CONFIG_VIDEO_BMP_LOGO
source = bmp_logo_bitmap;
- /* Allocate temporary space for computing colormap */
+ /* Allocate temporary space for computing colormap */
logo_red = malloc (BMP_LOGO_COLORS);
logo_green = malloc (BMP_LOGO_COLORS);
logo_blue = malloc (BMP_LOGO_COLORS);
- /* Compute color map */
+ /* Compute color map */
for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
logo_red[i] = (bmp_logo_palette[i] & 0x0f00) >> 4;
logo_green[i] = (bmp_logo_palette[i] & 0x00f0);
diff --git a/include/video_fb.h b/include/video_fb.h
index 9825f0c4c2..f649c54aba 100644
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -1,4 +1,4 @@
- /*
+/*
* (C) Copyright 1997-2002 ELTEC Elektronik AG
* Frank Gottschling <fgottschling@eltec.de>
*