diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
| commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
| tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /drivers/video/cyber2000fb.c | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/cyber2000fb.c')
| -rw-r--r-- | drivers/video/cyber2000fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 3894b2a501d6..c589d23e7f91 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
| @@ -1064,7 +1064,6 @@ static struct fb_ops cyber2000fb_ops = { | |||
| 1064 | .fb_fillrect = cyber2000fb_fillrect, | 1064 | .fb_fillrect = cyber2000fb_fillrect, |
| 1065 | .fb_copyarea = cyber2000fb_copyarea, | 1065 | .fb_copyarea = cyber2000fb_copyarea, |
| 1066 | .fb_imageblit = cyber2000fb_imageblit, | 1066 | .fb_imageblit = cyber2000fb_imageblit, |
| 1067 | .fb_cursor = soft_cursor, | ||
| 1068 | .fb_sync = cyber2000fb_sync, | 1067 | .fb_sync = cyber2000fb_sync, |
| 1069 | }; | 1068 | }; |
| 1070 | 1069 | ||