---

yaml --- r: 304272 b: refs/heads/master c: c38d044 h: refs/heads/master v: v3
git-mirror · Apr 10, 2012 · 0096430 · 0096430
1 parent 5bcff9c
commit 0096430
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18408da0e865537742dda474045abf88a49032f6
+refs/heads/master: c38d044bf295b99e90a187a1075a01d4d7c52aeb
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1656,17 +1656,6 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info)
 			ChannelNum = 1;
 		break;
 
-	case XG45:
-		if (tmp == 1)
-			ChannelNum = 2;
-		else if (tmp == 2)
-			ChannelNum = 3;
-		else if (tmp == 3)
-			ChannelNum = 4;
-		else
-			ChannelNum = 1;
-		break;
-
 	case XG40:
 	default:
 		if (tmp == 2)

diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -24,7 +24,6 @@ enum xgifb_display_type {
 enum XGI_CHIP_TYPE {
 	XG40 = 32,
 	XG42,
-	XG45,
 	XG20 = 48,
 	XG21,
 	XG27,
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ enum xgifb_display_type { @@
     enum XGI_CHIP_TYPE {
     	XG40 = 32,
     	XG42,
-    	XG45,
     	XG20 = 48,
     	XG21,
     	XG27,
@@ Expand Down @@