Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial

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

diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 7363d0b25fdfc12fda931d845e24321e346a82b4..6a81a1dd8f3d0bb357db89877bf53c8e4a745802 100644 (file)
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -484,7 +484,6 @@ static struct fb_ops epson1355fb_fbops = {
        .fb_imageblit   = cfb_imageblit,
        .fb_read        = epson1355fb_read,
        .fb_write       = epson1355fb_write,
-       .fb_cursor      = soft_cursor,
 };
 
 /* ------------------------------------------------------------------------- */