From 48b869b7dafb4bac76c934d2ba0ecbc174673d1c Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 11 Oct 2011 21:47:27 +0300 Subject: [PATCH] --- yaml --- r: 268801 b: refs/heads/master c: c11d0ef3e250a4483e10e6984362b07fbf12c5ae h: refs/heads/master i: 268799: e3ba49f2e81a50dea4e304f3917388401d5b587e v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main.h | 7 ------- trunk/drivers/staging/xgifb/XGI_main_26.c | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b19a5fe119e4..bf5ae5bf4ba5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9865d47d44600b86e00a274adc8bf28e10677da +refs/heads/master: c11d0ef3e250a4483e10e6984362b07fbf12c5ae diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h index 0d439e909619..1d0949c98c3a 100644 --- a/trunk/drivers/staging/xgifb/XGI_main.h +++ b/trunk/drivers/staging/xgifb/XGI_main.h @@ -125,13 +125,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); /* ------------------- Global Variables ----------------------------- */ -static struct fb_fix_screeninfo XGIfb_fix = { - .id = "XGI", - .type = FB_TYPE_PACKED_PIXELS, - .xpanstep = 1, - .ypanstep = 1, -}; - /* display status */ static int XGIfb_crt1off; static int XGIfb_forcecrt1 = -1; diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 5eed802225aa..ba7f09630d21 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2390,8 +2390,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, } + strncpy(fb_info->fix.id, "XGI", sizeof(fb_info->fix.id) - 1); + fb_info->fix.type = FB_TYPE_PACKED_PIXELS; + fb_info->fix.xpanstep = 1; + fb_info->fix.ypanstep = 1; + fb_info->flags = FBINFO_FLAG_DEFAULT; - fb_info->fix = XGIfb_fix; fb_info->screen_base = xgifb_info->video_vbase; fb_info->fbops = &XGIfb_ops; XGIfb_get_fix(&fb_info->fix, -1, fb_info);