diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-12-20 14:00:11 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-20 21:26:11 -0500 |
commit | 56bba8cb4218b2646a1d80c100bad689f93fef79 (patch) | |
tree | 2b42810cd441181694b204936a8760f042f817d0 | |
parent | 66cde97da7cbbc940cb3f3dbf9e8f0ac56431f8c (diff) |
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>
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 44bf8d4a216b..401a56e250bd 100644 --- 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 = { | |||
147 | 39721L,48L,16L,33L,10L, | 147 | 39721L,48L,16L,33L,10L, |
148 | 96L,2L,~0, /* No sync info */ | 148 | 96L,2L,~0, /* No sync info */ |
149 | FB_VMODE_NONINTERLACED, | 149 | FB_VMODE_NONINTERLACED, |
150 | 0, {0,0,0,0,0} | ||
151 | }; | 150 | }; |
152 | 151 | ||
153 | 152 | ||
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index d7112c39614b..02796a4317a9 100644 --- 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 = { | |||
593 | 39721L,48L,16L,33L,10L, | 593 | 39721L,48L,16L,33L,10L, |
594 | 96L,2,0, /* no sync info */ | 594 | 96L,2,0, /* no sync info */ |
595 | FB_VMODE_NONINTERLACED, | 595 | FB_VMODE_NONINTERLACED, |
596 | 0, {0,0,0,0,0} | ||
597 | }; | 596 | }; |
598 | 597 | ||
599 | static int matroxfb_dh_regit(const struct matrox_fb_info *minfo, | 598 | static int matroxfb_dh_regit(const struct matrox_fb_info *minfo, |