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/matrox/matroxfb_accel.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/matrox/matroxfb_accel.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c index c7f3e1321224..a5c825d99466 100644 --- a/drivers/video/matrox/matroxfb_accel.c +++ b/drivers/video/matrox/matroxfb_accel.c | |||
| @@ -122,7 +122,7 @@ void matrox_cfbX_init(WPMINFO2) { | |||
| 122 | ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea; | 122 | ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea; |
| 123 | ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect; | 123 | ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect; |
| 124 | ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit; | 124 | ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit; |
| 125 | ACCESS_FBINFO(fbops).fb_cursor = soft_cursor; | 125 | ACCESS_FBINFO(fbops).fb_cursor = NULL; |
| 126 | 126 | ||
| 127 | accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT; | 127 | accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT; |
| 128 | 128 | ||