summaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox/matroxfb_crtc2.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-17 13:55:28 +0100
committerPaul Mundt <lethal@linux-sh.org>2012-01-17 13:55:28 +0100
commit0c929238ca4baefe47f4034732db4c154f2329c6 (patch)
tree2636079800fa045501982a70e1be0425c1b968c2 /drivers/video/matrox/matroxfb_crtc2.c
parentvideo: pvr2fb: Fix up spurious section mismatch warnings. (diff)
parentsh: fix the sh_mmcif_plat_data in board-sh7757lcr (diff)
downloadlinux-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz
linux-0c929238ca4baefe47f4034732db4c154f2329c6.zip
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/video/matrox/matroxfb_crtc2.c')
-rw-r--r--drivers/video/matrox/matroxfb_crtc2.c1
1 files changed, 0 insertions, 1 deletions
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 = {
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,