From de8ddcba30c4bbdc9f1c274cd0fd8d9e7e30ac4e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 23 May 2007 13:57:50 -0700 Subject: [PATCH] --- yaml --- r: 56889 b: refs/heads/master c: 92c4579dbb3bc70bd397e272258c69f88de189b8 h: refs/heads/master i: 56887: 8351977639b6c8fd5baf8db70c4e781b8f633f6f v: v3 --- [refs] | 2 +- trunk/drivers/video/Kconfig | 7 ++++--- trunk/drivers/video/ps3fb.c | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1f54fcd49f14..b8eb000d84b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a01fbbd52e4faf5971856c011e87ec6571b62840 +refs/heads/master: 92c4579dbb3bc70bd397e272258c69f88de189b8 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index fdeb3e68a1c1..6e1f1ea21b38 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -1792,9 +1792,10 @@ config FB_IBM_GXT4500 config FB_PS3 bool "PS3 GPU framebuffer driver" depends on (FB = y) && PS3_PS3AV - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS ---help--- Include support for the virtual frame buffer in the PS3 platform. diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index 9756a728b74f..9cf92ba5d6e3 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -951,12 +951,14 @@ static int ps3fb_xdr_settings(u64 xdr_lpar) static struct fb_ops ps3fb_ops = { .fb_open = ps3fb_open, .fb_release = ps3fb_release, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write, .fb_check_var = ps3fb_check_var, .fb_set_par = ps3fb_set_par, .fb_setcolreg = ps3fb_setcolreg, - .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 = ps3fb_mmap, .fb_blank = ps3fb_blank, .fb_ioctl = ps3fb_ioctl,