Commit 21afbe0d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68k: Amifb modedb bug

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amifb: Fix bugs in the video mode database:
  - ntsc-lace lacks the yres value
  - a2024-15 is 15 Hz, not 10
parent 2732e425
...@@ -832,7 +832,7 @@ static struct fb_videomode ami_modedb[] __initdata = { ...@@ -832,7 +832,7 @@ static struct fb_videomode ami_modedb[] __initdata = {
FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP FB_SYNC_BROADCAST, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
}, { }, {
/* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */ /* 640x400, 15 kHz, 60 Hz interlaced (NTSC) */
"ntsc-lace", 60, 640, TAG_HIRES, 106, 86, 88, 33, 76, 4, "ntsc-lace", 60, 640, 400, TAG_HIRES, 106, 86, 88, 33, 76, 4,
FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP FB_SYNC_BROADCAST, FB_VMODE_INTERLACED | FB_VMODE_YWRAP
}, { }, {
/* 640x256, 15 kHz, 50 Hz (PAL) */ /* 640x256, 15 kHz, 50 Hz (PAL) */
...@@ -927,7 +927,7 @@ static struct fb_videomode ami_modedb[] __initdata = { ...@@ -927,7 +927,7 @@ static struct fb_videomode ami_modedb[] __initdata = {
0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
}, { }, {
/* 1024x800, 15 Hz */ /* 1024x800, 15 Hz */
"a2024-15", 10, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0, "a2024-15", 15, 1024, 800, TAG_HIRES, 0, 0, 0, 0, 0, 0,
0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP
} }
#endif #endif
......
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