diff options
Diffstat (limited to 'drivers/video/matrox/matroxfb_crtc2.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 03ae55b168ff..4b3344e03695 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
| @@ -163,11 +163,6 @@ static void matroxfb_dh_disable(struct matroxfb_dh_fb_info* m2info) { | |||
| 163 | ACCESS_FBINFO(hw).crtc2.ctl = 0x00000004; | 163 | ACCESS_FBINFO(hw).crtc2.ctl = 0x00000004; |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | static void matroxfb_dh_cfbX_init(struct matroxfb_dh_fb_info* m2info) { | ||
| 167 | /* no acceleration for secondary head... */ | ||
| 168 | m2info->cmap[16] = 0xFFFFFFFF; | ||
| 169 | } | ||
| 170 | |||
| 171 | static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info, | 166 | static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info, |
| 172 | struct fb_var_screeninfo* var) { | 167 | struct fb_var_screeninfo* var) { |
| 173 | unsigned int pos; | 168 | unsigned int pos; |
| @@ -385,7 +380,6 @@ static int matroxfb_dh_set_par(struct fb_info* info) { | |||
| 385 | } | 380 | } |
| 386 | } | 381 | } |
| 387 | up_read(&ACCESS_FBINFO(altout).lock); | 382 | up_read(&ACCESS_FBINFO(altout).lock); |
| 388 | matroxfb_dh_cfbX_init(m2info); | ||
| 389 | } | 383 | } |
| 390 | m2info->initialized = 1; | 384 | m2info->initialized = 1; |
| 391 | return 0; | 385 | return 0; |
