---

yaml --- r: 236359 b: refs/heads/master c: dbbc298 h: refs/heads/master i: 236357: ac0e48d 236355: 6e936d5 236351: 697f60a v: v3
git-mirror · Mar 10, 2011 · f5cdeed · f5cdeed
1 parent d902454
commit f5cdeed
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 600a710b8bb414903a8b7c28e22ca03a60b8191f
+refs/heads/master: dbbc2989a78872922601791983762c207a60f38c
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -2273,20 +2273,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	printk("XGIfb:chipid = %x\n", xgi_video_info.chip);
 	XGIhw_ext.jChipType = xgi_video_info.chip;
 
-	switch (xgi_video_info.chip) {
-	case XG40:
-	case XG41:
-	case XG42:
-	case XG45:
-	case XG20:
-	case XG21:
-	case XG27:
-		XGIhw_ext.bIntegratedMMEnabled = 1;
-		break;
-	default:
-		break;
-	}
-
 	if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) {
 		XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev);
 		if (XGIhw_ext.pjVirtualRomBase)

diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
@@ -152,9 +152,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
 	pVBInfo->ISXPDOS = 0;
 	printk("3");
 
-	if (!HwDeviceExtension->bIntegratedMMEnabled)
-		return 0; /* alan */
-
 	printk("4");
 
 	/* VBIOSVersion[4] = 0x0; */

diff --git a/trunk/drivers/staging/xgifb/vgatypes.h b/trunk/drivers/staging/xgifb/vgatypes.h
@@ -80,8 +80,6 @@ struct xgi_hw_device_info
 
     unsigned long  ulCRT2LCDType;        /* defined in the data structure type */
 
-    unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
-
 	unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
 					    unsigned long, unsigned long,
 					    unsigned long *);