---

yaml --- r: 268086 b: refs/heads/master c: 87c8b8b h: refs/heads/master v: v3
git-mirror · Sep 6, 2011 · 20b2e55 · 20b2e55
1 parent 47c2f9d
commit 20b2e55
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20fc30b9412013f96005e5d8de6af6c555d6650f
+refs/heads/master: 87c8b8b3466b7e5977701b59dc92a1b9537a46e0
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -167,7 +167,6 @@ static u32 pseudo_palette[17];
 
 
 /* display status */
-static int XGIfb_off;
 static int XGIfb_crt1off;
 static int XGIfb_forcecrt1 = -1;
 static int XGIfb_userom ;

diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1960,8 +1960,6 @@ static int __init XGIfb_setup(char *options)
 		} else if (!strncmp(this_opt, "rate:", 5)) {
 			xgi_video_info.refresh_rate = simple_strtoul(
 						this_opt + 5, NULL, 0);
-		} else if (!strncmp(this_opt, "off", 3)) {
-			XGIfb_off = 1;
 		} else if (!strncmp(this_opt, "crt1off", 7)) {
 			XGIfb_crt1off = 1;
 		} else if (!strncmp(this_opt, "filter:", 7)) {
@@ -2023,9 +2021,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	u8 CR48, CR38;
 	int ret;
 
-	if (XGIfb_off)
-		return -ENXIO;
-
 	memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
 	fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
 	if (!fb_info)