Skip to contentSkip to conversation

Moving MODULE_LICENSE();

PATCH In review Fry 2 participants 2 messages Feb 18, 2004

Subsystems (2)
Kernel janitors Framebuffer layer
lore
Share & tools
lore

Fry

author
#0 lore raw

PATCH 1/1 Moving MODULE_LICENSE();

Hey guys,

My first kernel patch. Hope I didn't miss one. Please CC me on any replies, I'm subscribed at work, not home.

Thanks,

Fry.

Signature · 1 line
PGP Public Key: http://members.optushome.com.au/fryboy/fryboy.pub
drivers/video/amifb.c renamed from drivers/video-old/amifb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/amifb.c linux-2.6.3/drivers/video/amifb.c
@@ -3812,7 +3812,6 @@
 
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -3826,3 +3825,5 @@
 	amifb_video_off();
 }
 #endif /* MODULE */
+
+MODULE_LICENSE("GPL");
drivers/video/atafb.c renamed from drivers/video-old/atafb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/atafb.c linux-2.6.3/drivers/video/atafb.c
@@ -3091,7 +3091,6 @@
 }
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -3107,3 +3106,5 @@
 	/* TODO: further clean up ... */
 }
 #endif /* MODULE */
+
+MODULE_LICENSE("GPL");
drivers/video/controlfb.c renamed from drivers/video-old/controlfb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/controlfb.c linux-2.6.3/drivers/video/controlfb.c
@@ -183,7 +183,6 @@
 /********************  The functions for controlfb_ops ********************/
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -202,6 +201,8 @@
 }
 #endif
 
+MODULE_LICENSE("GPL");
+
 /*
  * Checks a var structure
  */
drivers/video/cyberfb.c renamed from drivers/video-old/cyberfb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/cyberfb.c linux-2.6.3/drivers/video/cyberfb.c
@@ -1200,7 +1200,6 @@
 
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -1216,6 +1215,8 @@
 }
 #endif /* MODULE */
 
+MODULE_LICENSE("GPL");
+
 /*
  *
  * Low level initialization routines for the CyberVision64 graphics card
drivers/video/imsttfb.c renamed from drivers/video-old/imsttfb.c +4 -1
diff -r -u linux-2.6.3/drivers/video-old/imsttfb.c linux-2.6.3/drivers/video/imsttfb.c
@@ -1607,8 +1607,11 @@
 }
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 module_init(imsttfb_init);
 #endif
+
+module_init(imsttfb_init);
 module_exit(imsttfb_exit);
 
+MODULE_LICENSE("GPL");
+
drivers/video/maxinefb.c renamed from drivers/video-old/maxinefb.c +1 -1
diff -r -u linux-2.6.3/drivers/video-old/maxinefb.c linux-2.6.3/drivers/video/maxinefb.c
@@ -174,8 +174,8 @@
 }
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 module_init(maxinefb_init);
 #endif
 module_exit(maxinefb_exit);
 
+MODULE_LICENSE("GPL");
drivers/video/pm2fb.c renamed from drivers/video-old/pm2fb.c +2 -2
diff -r -u linux-2.6.3/drivers/video-old/pm2fb.c linux-2.6.3/drivers/video/pm2fb.c
@@ -2402,8 +2402,6 @@
 
 #ifdef MODULE
 
-MODULE_LICENSE("GPL");
-
 static char *mode = NULL;
 
 MODULE_PARM(mode, "s");

@@ -2421,6 +2419,8 @@
 }
 #endif /* MODULE */
 
+MODULE_LICENSE("GPL");
+
 /***************************************************************************
  * That's all folks!
  ***************************************************************************/
drivers/video/retz3fb.c renamed from drivers/video-old/retz3fb.c +1 -1
diff -r -u linux-2.6.3/drivers/video-old/retz3fb.c linux-2.6.3/drivers/video/retz3fb.c
@@ -1485,7 +1485,6 @@
 
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -1503,6 +1502,7 @@
 }
 #endif
 
+MODULE_LICENSE("GPL");
 
 /*
  *  Text console acceleration
drivers/video/sgivwfb.c renamed from drivers/video-old/sgivwfb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/sgivwfb.c linux-2.6.3/drivers/video/sgivwfb.c
@@ -819,7 +819,6 @@
 }
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -836,3 +835,5 @@
 }
 
 #endif				/* MODULE */
+
+MODULE_LICENSE("GPL");
drivers/video/vga16fb.c renamed from drivers/video-old/vga16fb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/vga16fb.c linux-2.6.3/drivers/video/vga16fb.c
@@ -1416,12 +1416,13 @@
 }
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 module_init(vga16fb_init);
 #endif
 module_exit(vga16fb_exit);
 
 
+MODULE_LICENSE("GPL");
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------
drivers/video/virgefb.c renamed from drivers/video-old/virgefb.c +2 -1
diff -r -u linux-2.6.3/drivers/video-old/virgefb.c linux-2.6.3/drivers/video/virgefb.c
@@ -2058,7 +2058,6 @@
 #endif
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

@@ -2074,6 +2073,8 @@
 }
 #endif /* MODULE */
 
+MODULE_LICENSE("GPL");
+
 static int cv3d_has_4mb(void)
 {
 	/* cyberfb version didn't work, neither does this (not reliably)

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 1 line · Fry

My first kernel patch. Hope I didn't miss one.

consider to send in one patch / file

Quoted 11 lines
drivers/video/amifb.c renamed from drivers/video-old/amifb.c +0 -1
@@ -3812,7 +3812,6 @@
 
 
 #ifdef MODULE
-MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

drivers/video/amifb.c line 3829

Quoted 6 lines
drivers/video/amifb.c renamed from drivers/video-old/amifb.c +2 -0
@@ -3826,3 +3825,5 @@
 	amifb_video_off();
 }
 #endif /* MODULE */
+
+MODULE_LICENSE("GPL");
[ snipped ]

that doesn't make much sense
please look at lwn.net the driver porting series
http://lwn.net/Articles/driver-porting/

init_module is 2.4 style not 2.6

good luck so far :)
regards
maks

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors