---

yaml --- r: 54929 b: refs/heads/master c: 87b4884 h: refs/heads/master i: 54927: 62ba6e2 v: v3
git-mirror · May 8, 2007 · 3c6ca7e · 3c6ca7e
1 parent f7df506
commit 3c6ca7e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6774935b61f99024121107d4ebb9d11b58052e6
+refs/heads/master: 87b4884935d387acc4c4418da6a75387bfcc24b9
diff --git a/trunk/drivers/video/Kconfig b/trunk/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/trunk/drivers/video/vfb.c b/trunk/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,
 };