---

yaml --- r: 268802 b: refs/heads/master c: 84a6c46 h: refs/heads/master v: v3
git-mirror · Oct 12, 2011 · 790afd0 · 790afd0
1 parent 48b869b
commit 790afd0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11d0ef3e250a4483e10e6984362b07fbf12c5ae
+refs/heads/master: 84a6c46eb2d4aac843d6946bf8319dfe78a35f96
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -565,6 +565,5 @@ static const struct _XGI_TV_filter {
 };
 
 static int           filter = -1;
-static unsigned char filter_tb;
 
 #endif
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -946,6 +946,8 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 		reg = xgifb_reg_get(XGIPART4, 0x01);
 
 		if (reg < 0xB0) { /* Set filter for XGI301 */
+			int filter_tb;
+
 			switch (xgifb_info->video_width) {
 			case 320:
 				filter_tb = (xgifb_info->TV_type ==
@@ -964,6 +966,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 					     TVMODE_NTSC) ? 7 : 15;
 				break;
 			default:
+				filter_tb = 0;
 				filter = -1;
 				break;
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -565,6 +565,5 @@ static const struct _XGI_TV_filter { @@
     };
     static int           filter = -1;
-    static unsigned char filter_tb;
     #endif