Merge ../linux-2.6

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

diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index cf8cdb108fd95c0d1eb2f3be7e947804e6a5abb8..48e70f153c4b23857aea147451418547c431f87f 100644 (file)
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -397,7 +397,6 @@ static struct fb_ops w100fb_ops = {
        .fb_fillrect  = cfb_fillrect,
        .fb_copyarea  = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_cursor    = soft_cursor,
 };
 
 #ifdef CONFIG_PM