From: Antonino A. Daplas <adaplas@gmail.com>
Date: Tue, 8 May 2007 07:39:01 +0000 (-0700)
Subject: vfb: use sys instead of cfb drawing functions
X-Git-Tag: Ubuntu-5.10.0-12.13~48258
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=87b4884935d387acc4c4418da6a75387bfcc24b9;p=mirror_ubuntu-hirsute-kernel.git

vfb: use sys instead of cfb drawing functions

Since vfb's framebuffer is vmalloc'ed, use the sys_* drawing functions
instead of cfb_*.

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 93d713d6c5a6..6d32726e8751 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1733,9 +1733,9 @@ config FB_PS3_DEFAULT_SIZE_M
 config FB_VIRTUAL
 	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
 	depends on FB
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
+	select FB_SYS_FILLRECT
+	select FB_SYS_COPYAREA
+	select FB_SYS_IMAGEBLIT
 	---help---
 	  This is a `virtual' frame buffer device. It operates on a chunk of
 	  unswappable kernel memory instead of on the memory of a graphics
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index a9b99b01bd8e..1293c2072d2a 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -88,9 +88,9 @@ static struct fb_ops vfb_ops = {
 	.fb_set_par	= vfb_set_par,
 	.fb_setcolreg	= vfb_setcolreg,
 	.fb_pan_display	= vfb_pan_display,
-	.fb_fillrect	= cfb_fillrect,
-	.fb_copyarea	= cfb_copyarea,
-	.fb_imageblit	= cfb_imageblit,
+	.fb_fillrect	= sys_fillrect,
+	.fb_copyarea	= sys_copyarea,
+	.fb_imageblit	= sys_imageblit,
 	.fb_mmap	= vfb_mmap,
 };