# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

6385111: Xorg auto-configuration Improvement

diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c

--- hw/xfree86/common/xf86Config.c	2010-09-03 16:45:19.100446935 -0700

+++ hw/xfree86/common/xf86Config.c	2010-09-03 16:45:21.057252713 -0700

@@ -2045,7 +2045,7 @@ configMonitor(MonPtr monitorp, XF86ConfM

     cmodep = conf_monitor->mon_modeline_lst;

     while( cmodep ) {

         mode = xnfcalloc(1, sizeof(DisplayModeRec));

-	mode->type       = 0;

+	mode->type       = M_T_USERDEF;

         mode->Clock      = cmodep->ml_clock;

         mode->HDisplay   = cmodep->ml_hdisplay;

         mode->HSyncStart = cmodep->ml_hsyncstart;