matroxfb: Initialize fbcon's cmap.

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 6b3ba8f1d41e9cbaeba4792c6747c2a26427fde6..02a00c5e42d8b7bab71b1077ee0cebeec60f0eef 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1680,6 +1680,7 @@ static int initMatrox2(WPMINFO struct board* b){
        /* after __init time we are like module... no logo */
        ACCESS_FBINFO(fbcon.flags) = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;
        ACCESS_FBINFO(video.len_usable) &= PAGE_MASK;
+       fb_alloc_cmap(&ACCESS_FBINFO(fbcon.cmap), 256, 1);
 
 #ifndef MODULE
        /* mode database is marked __init!!! */

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 964b4b72006f65e6b09c863b3ef9ecfb01f30cb3..1c71df5f87b07c72e2e2029c78b6d0e99613530c 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -605,6 +605,7 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
        m2info->fbcon.flags = FBINFO_FLAG_DEFAULT;
        m2info->fbcon.currcon = -1;
        m2info->fbcon.pseudo_palette = m2info->cmap;
+       fb_alloc_cmap(&m2info->fbcon.cmap, 256, 1);
 
        if (mem < 64)
                mem *= 1024;