patch-2.3.99-pre3 linux/drivers/video/modedb.c

Next file: linux/drivers/video/offb.c
Previous file: linux/drivers/video/macmodes.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/video/modedb.c linux/drivers/video/modedb.c
@@ -8,6 +8,7 @@
  *  more details.
  */
 
+#include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/console_struct.h>
@@ -253,7 +254,7 @@
     }
 }
 
-static int __init PROC_CONSOLE(const struct fb_info *info)
+static int PROC_CONSOLE(const struct fb_info *info)
 {
 	int fgc;
 	
@@ -275,8 +276,8 @@
 	return MINOR(current->tty->device) - 1;
 }
 
-static int __init try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
-			   const struct fb_videomode *mode, unsigned int bpp)
+int __fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
+		  const struct fb_videomode *mode, unsigned int bpp)
 {
     int err;
 
@@ -391,20 +392,22 @@
 		if ((name_matches(db[j], name, namelen) ||
 		     (res_specified && res_matches(db[j], xres, yres))) &&
 		    (!i || db[j].refresh == refresh) &&
-		    try_mode(var, info, &db[j], bpp))
+		    __fb_try_mode(var, info, &db[j], bpp))
 		    return 2-i;
 	}
     }
 
     DPRINTK("Trying default video mode\n");
-    if (try_mode(var, info, default_mode, default_bpp))
+    if (__fb_try_mode(var, info, default_mode, default_bpp))
 	return 3;
 
     DPRINTK("Trying all modes\n");
     for (i = 0; i < dbsize; i++)
-	if (try_mode(var, info, &db[i], default_bpp))
+	if (__fb_try_mode(var, info, &db[i], default_bpp))
 	    return 4;
 
     DPRINTK("No valid mode found\n");
     return 0;
 }
+
+EXPORT_SYMBOL(__fb_try_mode);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)