summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2007-06-01 09:46:45 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 17:18:28 +0200
commitbfeeffbb4fb73a32c00d52742850f88e563726a5 (patch)
tree445cce7eaf45639e5089ee1fb0e1d5f043ebf98d
parentvt8623fb: arkfb: null pointer dereference fix (diff)
downloadlinux-bfeeffbb4fb73a32c00d52742850f88e563726a5.tar.xz
linux-bfeeffbb4fb73a32c00d52742850f88e563726a5.zip
cfag12864bfb: Use sys_ instead of cfb_ framebuffer accessors
Because the framebuffer memory is allocated system RAM, use the sys_ drawing libraries. It also fixes the following compile error: LD .tmp_vmlinux1 drivers/built-in.o:(.data+0x8b48): undefined reference to `cfb_fillrect' drivers/built-in.o:(.data+0x8b50): undefined reference to `cfb_copyarea' drivers/built-in.o:(.data+0x8b58): undefined reference to `cfb_imageblit' [adaplas] Use fb_sys_read/write for the same reasons as above. Signed-off-by: Avuton Olrich <avuton@gmail.com> 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>
-rw-r--r--drivers/auxdisplay/Kconfig4
-rw-r--r--drivers/auxdisplay/cfag12864bfb.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 2e18a63ead36..ea4fe3e48f33 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -68,6 +68,10 @@ config CFAG12864B
depends on X86
depends on FB
depends on KS0108
+ select FB_SYS_FILLRECT
+ select FB_SYS_COPYAREA
+ select FB_SYS_IMAGEBLIT
+ select FB_SYS_FOPS
default n
---help---
If you have a Crystalfontz 128x64 2-color LCD, cfag12864b Series,
diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c
index 66fafbb1d087..307c190699e0 100644
--- a/drivers/auxdisplay/cfag12864bfb.c
+++ b/drivers/auxdisplay/cfag12864bfb.c
@@ -73,9 +73,11 @@ static int cfag12864bfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
static struct fb_ops cfag12864bfb_ops = {
.owner = THIS_MODULE,
- .fb_fillrect = cfb_fillrect,
- .fb_copyarea = cfb_copyarea,
- .fb_imageblit = cfb_imageblit,
+ .fb_read = fb_sys_read,
+ .fb_write = fb_sys_write,
+ .fb_fillrect = sys_fillrect,
+ .fb_copyarea = sys_copyarea,
+ .fb_imageblit = sys_imageblit,
.fb_mmap = cfag12864bfb_mmap,
};