Commit 00e35a54 authored by Russell King's avatar Russell King

[ARM] Fix monspecs in ARM-related framebuffer drivers.

Use named initialisers for monspecs; the format of the structure
changed a while back and it broke.
parent d63f2a5a
...@@ -67,12 +67,37 @@ ...@@ -67,12 +67,37 @@
*/ */
#define NR_MONTYPES 6 #define NR_MONTYPES 6
static struct fb_monspecs monspecs[NR_MONTYPES] __initdata = { static struct fb_monspecs monspecs[NR_MONTYPES] __initdata = {
{ 15469, 15781, 49, 51, 0 }, /* TV */ { /* TV */
{ 0, 99999, 0, 199, 0 }, /* Multi Freq */ .hfmin = 15469,
{ 58608, 58608, 64, 64, 0 }, /* Hi-res mono */ .hfmax = 15781,
{ 30000, 70000, 60, 60, 0 }, /* VGA */ .vfmin = 49,
{ 30000, 70000, 56, 75, 0 }, /* SVGA */ .vfmax = 51,
{ 30000, 70000, 60, 60, 0 } }, { /* Multi Freq */
.hfmin = 0,
.hfmax = 99999,
.vfmin = 0,
.vfmax = 199,
}, { /* Hi-res mono */
.hfmin = 58608,
.hfmax = 58608,
.vfmin = 64,
.vfmax = 64,
}, { /* VGA */
.hfmin = 30000,
.hfmax = 70000,
.vfmin = 60,
.vfmax = 60,
}, { /* SVGA */
.hfmin = 30000,
.hfmax = 70000,
.vfmin = 56,
.vfmax = 75,
}, {
.hfmin = 30000,
.hfmax = 70000,
.vfmin = 60,
.vfmax = 60,
}
}; };
static struct fb_info fb_info; static struct fb_info fb_info;
......
...@@ -1615,7 +1615,10 @@ static int __init sa1100fb_map_video_memory(struct sa1100fb_info *fbi) ...@@ -1615,7 +1615,10 @@ static int __init sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
/* Fake monspecs to fill in fbinfo structure */ /* Fake monspecs to fill in fbinfo structure */
static struct fb_monspecs monspecs __initdata = { static struct fb_monspecs monspecs __initdata = {
30000, 70000, 50, 65, 0 /* Generic */ .hfmin = 30000,
.hfmax = 70000,
.vfmin = 50,
.vfmax = 65,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment