patch-2.2.19 linux/drivers/video/tgafb.c

• Lines: 43
• Date: Sun Mar 25 11:37:38 2001
• Orig file: v2.2.18/drivers/video/tgafb.c
• Orig date: Sun Mar 25 11:13:09 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/video/tgafb.c linux/drivers/video/tgafb.c
@@ -59,7 +59,7 @@
 static int current_par_valid = 0;
 static struct display disp;
 
-static char __initdata default_fontname[40] = { 0 };
+static char default_fontname[40] __initdata = { 0 };
 static struct fb_var_screeninfo default_var;
 static int default_var_valid = 0;
 
@@ -1083,6 +1083,11 @@
 	fb_info.gen.info.modename);
 }
 
+    /*
+     *  Modularisation
+     */
+
+#ifdef MODULE
 
     /*
      *  Cleanup
@@ -1093,12 +1098,6 @@
     unregister_framebuffer(info);
 }
 
-
-    /*
-     *  Modularisation
-     */
-
-#ifdef MODULE
 int init_module(void)
 {
     tgafb_init();
@@ -1107,7 +1106,7 @@
 
 void cleanup_module(void)
 {
-    tgafb_cleanup(void);
+    tgafb_cleanup(&fb_info.gen.info);
 }
 #endif /* MODULE */