patch-2.3.16 linux/drivers/video/matroxfb.c

• Lines: 32
• Date: Mon Aug 30 18:17:51 1999
• Orig file: v2.3.15/linux/drivers/video/matroxfb.c
• Orig date: Thu Aug 26 13:05:40 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/video/matroxfb.c linux/drivers/video/matroxfb.c
@@ -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);
 	}