patch for the Matrox Frame Buffer

David Odin (David.Odin@bigfoot.com)
Mon, 30 Aug 1999 13:13:14 +0200

Hi,

Sorry to disturb you, but I have a patch concerning the Matrox Frame Buffer,
As of 2.3.15pre2 and 2.3.15, it cannot be compiled in the core kernel with
gcc 2.7.2.3. The problem is that gcc 2.7.2.3 doesn't like static local
variables with a section modifier :
matroxfb.c:5881: section attribute cannot be specified for local variables

"Petr Vandrovec Ing. VTEI" <VANDROVE@vc.cvut.cz> told me to send this patch
directly to you. This patch doesn't break anything. I use 2.3.15 for a few
days without any problems (from the console that is...)

Thanks for including this in 2.3.16

--- drivers/video/matroxfb.c.orig Thu Aug 26 13:32:24 1999
+++ drivers/video/matroxfb.c Thu Aug 26 13:33:57 1999
@@ -5635,6 +5635,16 @@
NULL,
NULL}};

+#ifndef MODULE
+ /* it cannot be static const struct due to __initdata
+ marker */
+ static struct fb_videomode defaultmode __initdata = {
+ /* 640x480 @ 60Hz, 31.5 kHz */
+ NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
+ 0, FB_VMODE_NONINTERLACED
+ };
+#endif /* !MODULE */
+
static int __init initMatrox2(WPMINFO struct display* d, struct board* b){
unsigned long ctrlptr_phys = 0;
unsigned long video_base_phys = 0;
@@ -5876,14 +5886,6 @@
#ifndef MODULE
/* mode database is marked __init ... */
{
- /* it cannot be static const struct due to __initdata
- marker */
- static struct fb_videomode defaultmode __initdata = {
- /* 640x480 @ 60Hz, 31.5 kHz */
- NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
- 0, FB_VMODE_NONINTERLACED
- };
-
fb_find_mode(&vesafb_defined, &ACCESS_FBINFO(fbcon), videomode[0]?videomode:NULL,
NULL, 0, &defaultmode, vesafb_defined.bits_per_pixel);
}

thanks,

DindinX

-- 
David.Odin@bigfoot.com


I think your opinions are reasonable, except for the one about my mental
instability.
		-- Psychology Professor, Farifield University


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/