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/cyblafb.c | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/cyblafb.c')
| -rw-r--r-- | drivers/video/cyblafb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index 6992100a508c..03fbe83d71a8 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
| @@ -968,7 +968,6 @@ static struct fb_ops cyblafb_ops __devinitdata = { | |||
| 968 | .fb_fillrect = cyblafb_fillrect, | 968 | .fb_fillrect = cyblafb_fillrect, |
| 969 | .fb_copyarea= cyblafb_copyarea, | 969 | .fb_copyarea= cyblafb_copyarea, |
| 970 | .fb_imageblit = cyblafb_imageblit, | 970 | .fb_imageblit = cyblafb_imageblit, |
| 971 | .fb_cursor = soft_cursor, | ||
| 972 | }; | 971 | }; |
| 973 | 972 | ||
| 974 | //========================================================================== | 973 | //========================================================================== |