diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
commit | 8006fdd6dc387abaa4b683bda4868c879fd76070 (patch) | |
tree | 314b08f4923dd9ab24930e6b2ac75889c244b154 /drivers/video/platinumfb.c | |
parent | 18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (diff) | |
parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/video/platinumfb.c')
-rw-r--r-- | drivers/video/platinumfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c index b00887e9851c..ca4082ae5a18 100644 --- a/drivers/video/platinumfb.c +++ b/drivers/video/platinumfb.c | |||
@@ -109,7 +109,6 @@ static struct fb_ops platinumfb_ops = { | |||
109 | .fb_fillrect = cfb_fillrect, | 109 | .fb_fillrect = cfb_fillrect, |
110 | .fb_copyarea = cfb_copyarea, | 110 | .fb_copyarea = cfb_copyarea, |
111 | .fb_imageblit = cfb_imageblit, | 111 | .fb_imageblit = cfb_imageblit, |
112 | .fb_cursor = soft_cursor, | ||
113 | }; | 112 | }; |
114 | 113 | ||
115 | /* | 114 | /* |