patch-2.4.10 linux/drivers/video/pvr2fb.c

• Lines: 26
• Date: Fri Sep 14 14:04:07 2001
• Orig file: v2.4.9/linux/drivers/video/pvr2fb.c
• Orig date: Wed Jul 25 17:10:24 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/video/pvr2fb.c linux/drivers/video/pvr2fb.c
@@ -51,7 +51,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/config.h>
 #include <linux/interrupt.h>
@@ -299,7 +299,7 @@
 #define DEFMODE_VGA	2
 
 static int defmode = DEFMODE_NTSC;
-static const char *mode_option __initdata = NULL;
+static char *mode_option __initdata = NULL;
 
 /* Get the fixed part of the display */
 
@@ -1165,6 +1165,7 @@
 #endif
 
 #ifdef MODULE
+MODULE_LICENSE("GPL");
 module_init(pvr2fb_init);
 #endif
 module_exit(pvr2fb_exit);