From d9b79c698729d1e96f5cfcc2592e8d769f822570 Mon Sep 17 00:00:00 2001 From: Manuel Lauss Date: Fri, 10 Jun 2011 15:23:04 +0000 Subject: [PATCH] --- yaml --- r: 271259 b: refs/heads/master c: 4ee58461510221a53080afd02752838f93cc57fc h: refs/heads/master i: 271257: aea4f372e9242b63808bb6cbded506b6f6731f8b 271255: 47f451a09496387c20f2990301a823f15b25b67c v: v3 --- [refs] | 2 +- trunk/drivers/video/Kconfig | 7 ++++--- trunk/drivers/video/au1200fb.c | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index db2728e63be5..c05f056e3adc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8be90b07ac2a07b4f1eb685caa97e88b9f85ef27 +refs/heads/master: 4ee58461510221a53080afd02752838f93cc57fc diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 549b960667c8..5e19de97242a 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -1756,9 +1756,10 @@ config FB_AU1100 config FB_AU1200 bool "Au1200 LCD Driver" depends on (FB = y) && MIPS && SOC_AU1200 - 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 This is the framebuffer driver for the AMD Au1200 SOC. It can drive various panels and CRTs by passing in kernel cmd line option diff --git a/trunk/drivers/video/au1200fb.c b/trunk/drivers/video/au1200fb.c index 4b58f7ba5728..b1b16d98c919 100644 --- a/trunk/drivers/video/au1200fb.c +++ b/trunk/drivers/video/au1200fb.c @@ -1502,9 +1502,11 @@ static struct fb_ops au1200fb_fb_ops = { .fb_set_par = au1200fb_fb_set_par, .fb_setcolreg = au1200fb_fb_setcolreg, .fb_blank = au1200fb_fb_blank, - .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_read = fb_sys_read, + .fb_write = fb_sys_write, .fb_sync = NULL, .fb_ioctl = au1200fb_ioctl, .fb_mmap = au1200fb_fb_mmap,