[linuxsh-dev] pvr2fb changes in 2.4.10

[M. R. B. <mr...@0x...>]

Uh, did the following changes come from mainline?  The fb_find_mode()
portion was discussed already, and it's wrong so I'm backing it out.

I hope we aren't sneaking subtle changes in and not logging/posting them.
Especially if it's in code that doesn't belong to you...

Thanks,

M. R.


--- linux-sh-dc/drivers/video/pvr2fb.c	Sat Sep 29 21:50:26 2001
+++ /home/mrbrown/src/cvs/sh/kernel/drivers/video/pvr2fb.c	Mon Oct  1 00:58:15 2001
@@ -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 */
 
@@ -1047,7 +1047,7 @@
 		defmode = DEFMODE_VGA;
 
 	if (!fb_find_mode(&var, &fb_info, mode_option, pvr2_modedb,
-	                  NUM_TOTAL_MODES, &pvr2_modedb[defmode], 16)) {
+	                  NUM_TOTAL_MODES, &pvr2_modedb[defmode], 32)) {
 		return -EINVAL;
 	}
 
@@ -1166,6 +1166,7 @@
 #endif
 
 #ifdef MODULE
+MODULE_LICENSE("GPL");
 module_init(pvr2fb_init);
 #endif
 module_exit(pvr2fb_exit);