Merge tag 'trace-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / video / fbdev / mb862xx / mb862xxfb_accel.c

diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
index f58ff90..4256926 100644 (file)
--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
@@ -303,19 +303,19 @@ static void mb86290fb_fillrect(struct fb_info *info,
        mb862xxfb_write_fifo(7, cmd, info);
 }
 
-void mb862xxfb_init_accel(struct fb_info *info, int xres)
+void mb862xxfb_init_accel(struct fb_info *info, struct fb_ops *fbops, int xres)
 {
        struct mb862xxfb_par *par = info->par;
 
        if (info->var.bits_per_pixel == 32) {
-               info->fbops->fb_fillrect = cfb_fillrect;
-               info->fbops->fb_copyarea = cfb_copyarea;
-               info->fbops->fb_imageblit = cfb_imageblit;
+               fbops->fb_fillrect = cfb_fillrect;
+               fbops->fb_copyarea = cfb_copyarea;
+               fbops->fb_imageblit = cfb_imageblit;
        } else {
                outreg(disp, GC_L0EM, 3);
-               info->fbops->fb_fillrect = mb86290fb_fillrect;
-               info->fbops->fb_copyarea = mb86290fb_copyarea;
-               info->fbops->fb_imageblit = mb86290fb_imageblit;
+               fbops->fb_fillrect = mb86290fb_fillrect;
+               fbops->fb_copyarea = mb86290fb_copyarea;
+               fbops->fb_imageblit = mb86290fb_imageblit;
        }
        outreg(draw, GDC_REG_DRAW_BASE, 0);
        outreg(draw, GDC_REG_MODE_MISC, 0x8000);
@@ -326,6 +326,5 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
            FBINFO_HWACCEL_IMAGEBLIT;
        info->fix.accel = 0xff; /*FIXME: add right define */
 }
-EXPORT_SYMBOL(mb862xxfb_init_accel);
 
 MODULE_LICENSE("GPL v2");