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/asiliantfb.c | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/asiliantfb.c')
| -rw-r--r-- | drivers/video/asiliantfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c index f4729f4df8ce..c64de59398f4 100644 --- a/drivers/video/asiliantfb.c +++ b/drivers/video/asiliantfb.c | |||
| @@ -106,7 +106,6 @@ static struct fb_ops asiliantfb_ops = { | |||
| 106 | .fb_fillrect = cfb_fillrect, | 106 | .fb_fillrect = cfb_fillrect, |
| 107 | .fb_copyarea = cfb_copyarea, | 107 | .fb_copyarea = cfb_copyarea, |
| 108 | .fb_imageblit = cfb_imageblit, | 108 | .fb_imageblit = cfb_imageblit, |
| 109 | .fb_cursor = soft_cursor, | ||
| 110 | }; | 109 | }; |
| 111 | 110 | ||
| 112 | /* Calculate the ratios for the dot clocks without using a single long long | 111 | /* Calculate the ratios for the dot clocks without using a single long long |