diff --git a/[refs] b/[refs] index 7e62eb92844a..1719e93f9d27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89ec4c238e7a3d7e660291f3f1a8181381baad77 +refs/heads/master: 397eeab321e87d8c1ef928b58f256513e6f481dc diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 944855b3e4af..8d8eadb64853 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -435,6 +435,11 @@ int fb_prepare_logo(struct fb_info *info, int rotate) depth = info->var.green.length; } + if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) { + /* assume console colormap */ + depth = 4; + } + if (depth >= 8) { switch (info->fix.visual) { case FB_VISUAL_TRUECOLOR: