[Linuxconsole-commit]CVS: ruby/linux/drivers/video hgafb.c,1.13,1.14 hitfb.c,1.5,1.6 mdacon.c,1.38,1.39 newport_con.c,1.9,1.10 nvvgacon.c,1.15,1.16 pm3fb.c,1.20,1.21 r3912fb.c,1.3,1.4 sed1345.c,1.5,1.6 sfb.c,1.4,1.5 sgivwfb.c,1.10,1.11 skeletonfb.c,1.11,1.12 vfb.c,1.29,1.30 vga16fb.c,1.21,1.22 vgacon.c,1.56,1.57 vr4181fb.c,1.2,1.3 vrc4171fb.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv6185/video

Modified Files:
	hgafb.c hitfb.c mdacon.c newport_con.c nvvgacon.c pm3fb.c 
	r3912fb.c sed1345.c sfb.c sgivwfb.c skeletonfb.c vfb.c 
	vga16fb.c vgacon.c vr4181fb.c vrc4171fb.c 
Log Message:
MODULE_LICENSE() additions.. newport cleanup.



Index: hgafb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hgafb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hgafb.c	2001/07/10 17:13:10	1.13
+++ hgafb.c	2001/10/29 22:58:43	1.14
@@ -756,7 +756,7 @@
 
 MODULE_AUTHOR("Ferenc Bakonyi (fe...@dr...)");
 MODULE_DESCRIPTION("FBDev driver for Hercules Graphics Adaptor");
-
+MODULE_LICENSE("GPL");
 MODULE_PARM(font, "s");
 MODULE_PARM_DESC(font, "Specifies one of the compiled-in fonts (VGA8x8, VGA8x16, SUN8x16, Acorn8x8, PEARL8x8) (default=none)");
 MODULE_PARM(nologo, "i");

Index: hitfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hitfb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hitfb.c	2001/08/27 16:36:15	1.5
+++ hitfb.c	2001/10/29 22:58:43	1.6
@@ -166,27 +166,13 @@
     return 0;
 }
 
-
-void hitfb_cleanup(struct fb_info *info)
+static void __exit hitfb_exit(void)
 {
-    unregister_framebuffer(info);
+    unregister_framebuffer(&fb_info);
 }
-
 
-#ifdef MODULE
-int init_module(void)
-{
-    return hitfb_init();
-}
+module_init(hitfb_init);
+module_exit(hitfb_exit);
 
-void cleanup_module(void)
-{
-  hitfb_cleanup(void);
-}
-#endif
+MODULE_LICENSE("GPL");
 
-/*
- * Local variables:
- * c-basic-offset: 4
- * End:
- */

Index: mdacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/mdacon.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mdacon.c	2001/10/04 02:45:52	1.38
+++ mdacon.c	2001/10/29 22:58:43	1.39
@@ -619,4 +619,6 @@
 
 module_init(mda_console_init);
 module_exit(mda_module_exit);
+
+MODULE_LICENSE("GPL");
 #endif

Index: newport_con.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/newport_con.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- newport_con.c	2001/10/29 00:11:00	1.9
+++ newport_con.c	2001/10/29 22:58:43	1.10
@@ -718,10 +718,7 @@
     con_save_screen:	DUMMY
 };
 
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-
-int init_module(void)
+int __init newport_module_init(void)
 {
 	if (!newport_startup())
 		printk("Error loading SGI Newport Console driver\n");
@@ -732,7 +729,7 @@
 	return 0;
 }
 
-int cleanup_module(void)
+static void __exit newport_module_exit(void);
 {
 	int i;
 
@@ -740,7 +737,10 @@
 	/* free memory used by user font */
 	for (i = 0; i < MAX_NR_CONSOLES; i++)
 		newport_set_def_font(i, NULL);
-
-	return 0;
 }
-#endif
+
+module_init(newport_module_init);
+module_exit(newport_module_exit);
+
+MODULE_LICENSE("GPL");
+

Index: nvvgacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/nvvgacon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- nvvgacon.c	2001/05/14 02:50:35	1.15
+++ nvvgacon.c	2001/10/29 22:58:43	1.16
@@ -870,3 +870,5 @@
 module_init(nvvgacon_module_init);
 module_exit(nvvgacon_module_exit);
 
+MODULE_LICENSE("GPL");
+

Index: pm3fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/pm3fb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pm3fb.c	2001/10/02 11:42:27	1.20
+++ pm3fb.c	2001/10/29 22:58:43	1.21
@@ -2449,4 +2449,7 @@
 }
 module_init(pm3fb_init_module);
 module_exit(pm3fb_cleanup_module);
+
+MODULE_LICENSE("GPL");
+
 #endif /* MODULE */

Index: r3912fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/r3912fb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- r3912fb.c	2001/06/06 14:24:49	1.3
+++ r3912fb.c	2001/10/29 22:58:43	1.4
@@ -369,5 +369,7 @@
 #ifdef MODULE
 module_init(r3912fb_init);
 module_exit(r3912fb_exit);
+
+MODULE_LICENSE("GPL");
 #endif
 

Index: sed1345.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sed1345.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sed1345.c	2001/06/06 14:24:49	1.5
+++ sed1345.c	2001/10/29 22:58:43	1.6
@@ -175,5 +175,7 @@
 #ifdef MODULE
 module_init(sed1345_init);
 module_exit(sed1345_exit);
+
+MODULE_LICENSE("GPL");
 #endif
 

Index: sfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sfb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sfb.c	2001/06/06 02:31:06	1.4
+++ sfb.c	2001/10/29 22:58:43	1.5
@@ -231,5 +231,6 @@
 #ifdef MODULE
 module_init(sfb_init);
 module_exit(sfb_exit);
-#endif
 
+MODULE_LICENSE("GPL");
+#endif 

Index: sgivwfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/sgivwfb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sgivwfb.c	2001/10/29 00:11:00	1.10
+++ sgivwfb.c	2001/10/29 22:58:43	1.11
@@ -668,13 +668,7 @@
   return -ENXIO;
 }
 
-#ifdef MODULE
-int init_module(void)
-{
-  return sgivwfb_init();
-}
-
-void cleanup_module(void)
+static void __exit sgivwfb_exit(void)
 {
   struct sgivw_par *par = fb_info.par;
 
@@ -684,4 +678,8 @@
   iounmap(fb_info.screenbase);
 }
 
-#endif /* MODULE */
+module_init(sgivwfb_init);
+module_exit(sgivwfb_exit);
+
+MODULE_LICENSE("GPL");
+

Index: skeletonfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/skeletonfb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- skeletonfb.c	2001/08/03 17:08:45	1.11
+++ skeletonfb.c	2001/10/29 22:58:43	1.12
@@ -474,4 +474,6 @@
 #ifdef MODULE
 module_init(xxxfb_init);
 module_exit(xxxfb_cleanup);
+
+MODULE_LICENSE("GPL");
 #endif /* MODULE */

Index: vfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vfb.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- vfb.c	2001/08/03 17:08:51	1.29
+++ vfb.c	2001/10/29 22:58:43	1.30
@@ -424,4 +424,6 @@
 
 module_init(vfb_init);
 module_exit(vfb_cleanup);
+
+MODULE_LICENSE("GPL");
 #endif /* MODULE */

Index: vga16fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vga16fb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- vga16fb.c	2001/06/10 21:20:45	1.21
+++ vga16fb.c	2001/10/29 22:58:43	1.22
@@ -564,6 +564,8 @@
 #ifdef MODULE
 module_init(vga16fb_init);
 module_exit(vga16fb_exit);
+
+MODULE_LICENSE("GPL");
 #endif
 
 /*

Index: vgacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vgacon.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- vgacon.c	2001/10/07 17:16:06	1.56
+++ vgacon.c	2001/10/29 22:58:43	1.57
@@ -994,4 +994,6 @@
 
 module_init(vga_console_init);
 module_exit(vga_module_exit);
+
+MODULE_LICENSE("GPL");
 #endif

Index: vr4181fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vr4181fb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vr4181fb.c	2001/10/05 03:58:58	1.2
+++ vr4181fb.c	2001/10/29 22:58:43	1.3
@@ -444,5 +444,7 @@
 #ifdef MODULE
 module_init(vr4181fb_init);
 module_exit(vr4181fb_exit);
+
+MODULE_LICENSE("GPL");
 #endif
 

Index: vrc4171fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vrc4171fb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vrc4171fb.c	2001/08/27 16:36:15	1.2
+++ vrc4171fb.c	2001/10/29 22:58:43	1.3
@@ -250,5 +250,7 @@
 #ifdef MODULE
 module_init(vrc4171fb_init);
 module_exit(vrc4171fb_exit);
+
+MODULE_LICENSE("GPL");
 #endif