---

yaml --- r: 267720 b: refs/heads/master c: b64aa65 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · 56fc1b7 · 56fc1b7
1 parent eeb5ad9
commit 56fc1b7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8145f9febb46a4feb61cd42bdfaecb4c78d787e1
+refs/heads/master: b64aa655c2a74716c00f7ee60d86a3d715ba1ca6
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -163,7 +163,6 @@ static struct fb_fix_screeninfo XGIfb_fix = {
 	.xpanstep	= 1,
 	.ypanstep	= 1,
 };
-static char myid[20];
 static u32 pseudo_palette[17];
 
 

diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1481,8 +1481,6 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 	DEBUGPRN("inside get_fix");
 	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
 
-	strcpy(fix->id, myid);
-
 	fix->smem_start = xgi_video_info.video_base;
 
 	fix->smem_len = xgi_video_info.video_size;