patch-2.4.7 linux/drivers/video/tgafb.c
Next file: linux/fs/affs/Changes
Previous file: linux/drivers/video/tdfxfb.c
Back to the patch index
Back to the overall index
- Lines: 67
- Date:
Wed Jul 4 14:41:33 2001
- Orig file:
v2.4.6/linux/drivers/video/tgafb.c
- Orig date:
Fri Feb 9 11:30:23 2001
diff -u --recursive --new-file v2.4.6/linux/drivers/video/tgafb.c linux/drivers/video/tgafb.c
@@ -60,7 +60,7 @@
static int current_par_valid = 0;
static struct display disp;
-static char default_fontname[40] = { 0 };
+static char default_fontname[40] __initdata = { 0 };
static struct fb_var_screeninfo default_var;
static int default_var_valid = 0;
@@ -281,9 +281,9 @@
static void tgafb_set_disp(const void *fb_par, struct display *disp,
struct fb_info_gen *info);
+#ifndef MODULE
int tgafb_setup(char*);
-int tgafb_init(void);
-void tgafb_cleanup(struct fb_info *info);
+#endif
static void tgafb_set_pll(int f);
#if 1
@@ -879,6 +879,7 @@
};
+#ifndef MODULE
/*
* Setup
*/
@@ -910,6 +911,7 @@
}
return 0;
}
+#endif
/*
@@ -990,9 +992,9 @@
* Cleanup
*/
-void tgafb_cleanup(struct fb_info *info)
+void __exit tgafb_cleanup(void)
{
- unregister_framebuffer(info);
+ unregister_framebuffer(&fb_info.gen.info);
}
@@ -1001,14 +1003,7 @@
*/
#ifdef MODULE
-int init_module(void)
-{
- return tgafb_init();
-}
-
-void cleanup_module(void)
-{
- tgafb_cleanup(void);
-}
-#endif /* MODULE */
+module_init(tgafb_init);
+#endif
+module_exit(tgafb_cleanup);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)