From 97ac582e52d5e9d0c69f8824cf44853a5c5ba59a Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 26 Jun 2006 00:26:36 -0700 Subject: [PATCH] --- yaml --- r: 30292 b: refs/heads/master c: 0c683dbfc017e52e632853b33981be1a49276ba6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82550927dd6e..4f57baf36797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae6d3218760f3cc28192de1f7ff594be744495b4 +refs/heads/master: 0c683dbfc017e52e632853b33981be1a49276ba6 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 9bb6763d0cb8..2529805ed1c7 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -433,7 +433,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate) depth = info->var.green.length; } - if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) { + if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) { /* assume console colormap */ depth = 4; }