patch-2.4.20 linux-2.4.20/drivers/video/q40fb.c

Next file: linux-2.4.20/drivers/video/radeon.h
Previous file: linux-2.4.20/drivers/video/pm3fb.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/video/q40fb.c linux-2.4.20/drivers/video/q40fb.c
@@ -187,8 +187,7 @@
 }
 
 static int q40_setcolreg(unsigned regno, unsigned red, unsigned green,
-			 unsigned blue, unsigned transp,
-			 const struct fb_info *info)
+			 unsigned blue, unsigned transp, struct fb_info *info)
 {
     /*
      *  Set a single color register. The values supplied have a 16 bit
@@ -293,7 +292,7 @@
 
   if (con<0) con=0;
 
-   display->screen_base = fix.smem_start;
+   display->screen_base = (char *)fix.smem_start;
    display->visual = fix.visual;
    display->type = fix.type;
    display->type_aux = fix.type_aux;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)