[PATCH] Always enable outputs that have been forced on in the configuration file

[simon.farnsworth at onelan.com]

From: Simon Farnsworth <simon.farnsworth at onelan.co.uk>

If the user has gone to the effort of manually enabling an output in
the configuration file assume that they know what they're doing.
---
 hw/xfree86/modes/xf86Crtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index c6eed33..3c10a7a 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1544,7 +1544,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	 */
 	output->status = (*output->funcs->detect)(output);
 
-	if (output->status == XF86OutputStatusDisconnected)
+	if (output->status == XF86OutputStatusDisconnected &&
+            !xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
 	{
 	    xf86OutputSetEDID (output, NULL);
 	    continue;
-- 
1.5.4.1