fbdev: matroxfb: Fix compilation after fb_var_screeninfo change

Commit fb21c2f42879 ("fbdev: Add FOURCC-based format configuration API")
modified the layout of the fb_var_screeninfo structure. Remove zero
fields from the static initializers in the matroxfb driver accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 44bf8d4a216b41afb4d15244b1370c8848285700..401a56e250bd40e3ba484c403ff1975357e202e9 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -147,7 +147,6 @@ static struct fb_var_screeninfo vesafb_defined = {
        39721L,48L,16L,33L,10L,
        96L,2L,~0,      /* No sync info */
        FB_VMODE_NONINTERLACED,
-       0, {0,0,0,0,0}
 };
 
 

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index d7112c39614b0006736c8b9ea76f91e07a748683..02796a4317a94c95e3d2ae10649f69e36490c7fd 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -593,7 +593,6 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
                39721L,48L,16L,33L,10L,
                96L,2,0,        /* no sync info */
                FB_VMODE_NONINTERLACED,
-               0, {0,0,0,0,0}
 };
 
 static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,