diff options
Diffstat (limited to 'drivers/video/sis/sis_main.c')
-rw-r--r-- | drivers/video/sis/sis_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index a4e05e4d7501..a531a0f7cdf2 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -1891,9 +1891,6 @@ static struct fb_ops sisfb_ops = { | |||
1891 | .fb_fillrect = fbcon_sis_fillrect, | 1891 | .fb_fillrect = fbcon_sis_fillrect, |
1892 | .fb_copyarea = fbcon_sis_copyarea, | 1892 | .fb_copyarea = fbcon_sis_copyarea, |
1893 | .fb_imageblit = cfb_imageblit, | 1893 | .fb_imageblit = cfb_imageblit, |
1894 | #ifdef CONFIG_FB_SOFT_CURSOR | ||
1895 | .fb_cursor = soft_cursor, | ||
1896 | #endif | ||
1897 | .fb_sync = fbcon_sis_sync, | 1894 | .fb_sync = fbcon_sis_sync, |
1898 | #ifdef SIS_NEW_CONFIG_COMPAT | 1895 | #ifdef SIS_NEW_CONFIG_COMPAT |
1899 | .fb_compat_ioctl= sisfb_ioctl, | 1896 | .fb_compat_ioctl= sisfb_ioctl, |
@@ -2115,7 +2112,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo) | |||
2115 | if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) && | 2112 | if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) && |
2116 | (!((ivideo->sisvga_engine == SIS_315_VGA) && | 2113 | (!((ivideo->sisvga_engine == SIS_315_VGA) && |
2117 | (ivideo->vbflags2 & VB2_CHRONTEL))) ) { | 2114 | (ivideo->vbflags2 & VB2_CHRONTEL))) ) { |
2118 | if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) { | 2115 | if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) { |
2119 | ivideo->sisfb_tvstd = -1; | 2116 | ivideo->sisfb_tvstd = -1; |
2120 | printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n"); | 2117 | printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n"); |
2121 | } | 2118 | } |