Merge branch 'master' of git://git.denx.de/u-boot-video

matwey · Jul 17, 2010 · 293e393 · 293e393
2 parents 0fe247b + 7c050f8
commit 293e393
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-										    /*
+/*
  * (C) Copyright 1997-2002 ELTEC Elektronik AG
  * Frank Gottschling <[email protected]>
  *