Merge tag 'ubifs-for-linus-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / video / fbdev / controlfb.c

diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index 717134c141ffe24ba04d0343be3f7315ed0c37bc..5c5284e8ae0e9611d09e88d1c2d5d01154fccdb6 100644 (file)
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -755,15 +755,14 @@ static int controlfb_mmap(struct fb_info *info,
 
 static const struct fb_ops controlfb_ops = {
        .owner          = THIS_MODULE,
+       __FB_DEFAULT_IOMEM_OPS_RDWR,
        .fb_check_var   = controlfb_check_var,
        .fb_set_par     = controlfb_set_par,
        .fb_setcolreg   = controlfb_setcolreg,
        .fb_pan_display = controlfb_pan_display,
        .fb_blank       = controlfb_blank,
+       __FB_DEFAULT_IOMEM_OPS_DRAW,
        .fb_mmap        = controlfb_mmap,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
 };
 
 /*