From 56fc1b7bb9c197e555528dfa96b567029a68a646 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Wed, 24 Aug 2011 18:21:52 +0300
Subject: [PATCH] --- yaml --- r: 267720 b: refs/heads/master c:
 b64aa655c2a74716c00f7ee60d86a3d715ba1ca6 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main.h    | 1 -
 trunk/drivers/staging/xgifb/XGI_main_26.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index eb75ec98e20d..ba41afb217b6 100644
--- 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
index af95ad71d0f2..59f741136cfc 100644
--- 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
index 922acbc52ed6..7b36b7ea4640 100644
--- 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;