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/valkyriefb.c | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/valkyriefb.c')
-rw-r--r-- | drivers/video/valkyriefb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 31a2bbc53974..ce97ec8eae97 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c | |||
@@ -135,7 +135,6 @@ static struct fb_ops valkyriefb_ops = { | |||
135 | .fb_fillrect = cfb_fillrect, | 135 | .fb_fillrect = cfb_fillrect, |
136 | .fb_copyarea = cfb_copyarea, | 136 | .fb_copyarea = cfb_copyarea, |
137 | .fb_imageblit = cfb_imageblit, | 137 | .fb_imageblit = cfb_imageblit, |
138 | .fb_cursor = soft_cursor, | ||
139 | }; | 138 | }; |
140 | 139 | ||
141 | /* Sets the video mode according to info->var */ | 140 | /* Sets the video mode according to info->var */ |