Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176632
b: refs/heads/master
c: 5ab9481
h: refs/heads/master
v: v3
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Dec 16, 2009
1 parent a506749 commit 7209436
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09335865c34c2e74c7ba0a2c7224e302e0f1a5d8
refs/heads/master: 5ab948153a1e409afdc0f78a376ad3710df5b109
2 changes: 1 addition & 1 deletion trunk/drivers/video/sis/sis_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2115,7 +2115,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) &&
(!((ivideo->sisvga_engine == SIS_315_VGA) &&
(ivideo->vbflags2 & VB2_CHRONTEL))) ) {
if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) {
if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) {
ivideo->sisfb_tvstd = -1;
printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n");
}
Expand Down

0 comments on commit 7209436

Please sign in to comment.