Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[powerpc.git] / drivers / video / acornfb.c

diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 9b6a393..193b482 100644 (file)
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -926,7 +926,6 @@ static struct fb_ops acornfb_ops = {
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
        .fb_mmap        = acornfb_mmap,
-       .fb_cursor      = soft_cursor,
 };
 
 /*