From d7b0b2c9bccb87472560074354711af61f0a2459 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 6 Dec 2011 00:10:49 +0200
Subject: [PATCH] --- yaml --- r: 281295 b: refs/heads/master c:
 2d2c880f8c16f4047cb642a5843ca6fa56f0d2a6 h: refs/heads/master i:   281293:
 02f8eb80a7707d5223fb2d9074e3f1e589ec7567   281291:
 8889e12849860e10afccf3659efe1e3296b87002   281287:
 29811d124928d1c5c72f31fc62c472e2b64ada8f   281279:
 ed15316e99bddfbb0f43c40355872f749c3eb36f v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main_26.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e1749371f454..4f66d443fead 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25aa75f142e0e6945a6d5db3dbcd9d6919525866
+refs/heads/master: 2d2c880f8c16f4047cb642a5843ca6fa56f0d2a6
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index b07c4774f3bf..2502c49c9c5b 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -45,6 +45,7 @@
 #define GPIOG_EN    (1<<6)
 #define GPIOG_READ  (1<<1)
 
+static char *forcecrt2type;
 static char *mode;
 static int vesa = -1;
 static unsigned int refresh_rate;
@@ -2358,6 +2359,8 @@ static int __init xgifb_init(void)
 {
 	char *option = NULL;
 
+	if (forcecrt2type != NULL)
+		XGIfb_search_crt2type(forcecrt2type);
 	if (fb_get_options("xgifb", &option))
 		return -ENODEV;
 	XGIfb_setup(option);
@@ -2380,6 +2383,11 @@ MODULE_AUTHOR("XGITECH , Others");
 module_param(mode, charp, 0);
 module_param(vesa, int, 0);
 module_param(filter, int, 0);
+module_param(forcecrt2type, charp, 0);
+
+MODULE_PARM_DESC(forcecrt2type,
+	"\nForce the second display output type. Possible values are NONE,\n"
+	"LCD, TV, VGA, SVIDEO or COMPOSITE.\n");
 
 MODULE_PARM_DESC(mode,
 	"\nSelects the desired default display mode in the format XxYxDepth,\n"