Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / video / vfb.c

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 92d46555dd86e2fd02ee7985ef8ba41ca44d1b48..8794dc5d24667527fdd838481bd5f18f4b3482eb 100644 (file)
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -92,7 +92,6 @@ static struct fb_ops vfb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
        .fb_mmap        = vfb_mmap,
 };