summaryrefslogtreecommitdiff
path: root/drivers/video/cyblafb.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-08 03:51:47 (GMT)
committerJeff Garzik <jgarzik@pobox.com>2005-11-08 03:51:47 (GMT)
commit6b995751c2e851d2bc9c277b5884d0adb519e31d (patch)
tree7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /drivers/video/cyblafb.c
parent6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff)
parentd27ba47e7e8c466c18983a1779d611f82d6a354f (diff)
downloadlinux-6b995751c2e851d2bc9c277b5884d0adb519e31d.tar.xz
Merge branch 'master'
Diffstat (limited to 'drivers/video/cyblafb.c')
-rw-r--r--drivers/video/cyblafb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index 6992100..03fbe83 100644
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -968,7 +968,6 @@ static struct fb_ops cyblafb_ops __devinitdata = {
.fb_fillrect = cyblafb_fillrect,
.fb_copyarea= cyblafb_copyarea,
.fb_imageblit = cyblafb_imageblit,
- .fb_cursor = soft_cursor,
};
//==========================================================================