diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/video/cyber2000fb.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
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 | ||