Remove write-only palette variable from matroxfb. Now it is possible to build

matroxfb without fbcon support.

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index f4f88d56c9b7561e185bdf2d7d0ccb2547a9897d..6b3ba8f1d41e9cbaeba4792c6747c2a26427fde6 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -627,11 +627,6 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
        if (regno >= ACCESS_FBINFO(curr.cmap_len))
                return 1;
 
-       ACCESS_FBINFO(palette[regno].red)   = red;
-       ACCESS_FBINFO(palette[regno].green) = green;
-       ACCESS_FBINFO(palette[regno].blue)  = blue;
-       ACCESS_FBINFO(palette[regno].transp) = transp;
-
        if (ACCESS_FBINFO(fbcon).var.grayscale) {
                /* gray = 0.30*R + 0.59*G + 0.11*B */
                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
@@ -748,19 +743,6 @@ static int matroxfb_set_par(struct fb_info *info)
                else
                        ACCESS_FBINFO(curr.ydstorg.pixels) = (ydstorg * 8) / var->bits_per_pixel;
                ACCESS_FBINFO(curr.final_bppShift) = matroxfb_get_final_bppShift(PMINFO var->bits_per_pixel);
-               if (visual == MX_VISUAL_PSEUDOCOLOR) {
-                       int i;
-
-                       for (i = 0; i < 16; i++) {
-                               int j;
-
-                               j = color_table[i];
-                               ACCESS_FBINFO(palette[i].red)   = default_red[j];
-                               ACCESS_FBINFO(palette[i].green) = default_grn[j];
-                               ACCESS_FBINFO(palette[i].blue)  = default_blu[j];
-                       }
-               }
-
                {       struct my_timming mt;
                        struct matrox_hw_state* hw;
                        int out;

diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 2548b8d2f775569bd6ba4ca25093ae77d968f5fb..77965337d571c5bcda72152ddbd421bb7740ded2 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -595,7 +595,6 @@ struct matrox_fb_info {
                                        dll:1;
                                      } memory;
                              } values;
-       struct { unsigned red, green, blue, transp; } palette[256];
        u_int32_t cmap[17];
 };
 

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index fa54ac6046710ec03c0e897007850cc0af928658..964b4b72006f65e6b09c863b3ef9ecfb01f30cb3 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -33,10 +33,6 @@ static int matroxfb_dh_setcolreg(unsigned regno, unsigned red, unsigned green,
 
        if (regno >= 16)
                return 1;
-       m2info->palette[regno].red = red;
-       m2info->palette[regno].blue = blue;
-       m2info->palette[regno].green = green;
-       m2info->palette[regno].transp = transp;
        if (m2info->fbcon.var.grayscale) {
                /* gray = 0.30*R + 0.59*G + 0.11*B */
                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;

diff --git a/drivers/video/matrox/matroxfb_crtc2.h b/drivers/video/matrox/matroxfb_crtc2.h
index d83de236efa8352d700373b421f13e7e0ec1d12c..fa148354eb2f9dbd4122a4457e4714f12227a5a1 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.h
+++ b/drivers/video/matrox/matroxfb_crtc2.h
@@ -30,7 +30,6 @@ struct matroxfb_dh_fb_info {
        int                     interlaced:1;
 
        u_int32_t cmap[17];
-       struct { unsigned red, green, blue, transp; } palette[17];
 };
 
 #endif /* __MATROXFB_CRTC2_H__ */