diff options
Diffstat (limited to 'drivers/video/matrox')
-rw-r--r-- | drivers/video/matrox/matroxfb_accel.c | 2 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 1 |
2 files changed, 1 insertions, 2 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 | ||
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 429047ac615a..d52d7d825c41 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
@@ -576,7 +576,6 @@ static struct fb_ops matroxfb_dh_ops = { | |||
576 | .fb_fillrect = cfb_fillrect, | 576 | .fb_fillrect = cfb_fillrect, |
577 | .fb_copyarea = cfb_copyarea, | 577 | .fb_copyarea = cfb_copyarea, |
578 | .fb_imageblit = cfb_imageblit, | 578 | .fb_imageblit = cfb_imageblit, |
579 | .fb_cursor = soft_cursor, | ||
580 | }; | 579 | }; |
581 | 580 | ||
582 | static struct fb_var_screeninfo matroxfb_dh_defined = { | 581 | static struct fb_var_screeninfo matroxfb_dh_defined = { |