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

[linux-2.6] / drivers / video / p9100.c

diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index b76a5a9a125be4dde6d77959e780aed6fa664391..9aaf65fb623ae99e0df6dc2289c1f7e7379af89d 100644 (file)
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -48,7 +48,6 @@ static struct fb_ops p9100_ops = {
        .fb_imageblit           = cfb_imageblit,
        .fb_mmap                = p9100_mmap,
        .fb_ioctl               = p9100_ioctl,
-       .fb_cursor              = soft_cursor,
 };
 
 /* P9100 control registers */