18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 6385111: Xorg auto-configuration Improvement |
21 6385111: Xorg auto-configuration Improvement |
22 |
22 |
23 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
23 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c |
24 --- hw/xfree86/common/xf86Config.c 2010-09-03 16:45:19.100446935 -0700 |
24 index d5e2097..e64d54c 100644 |
25 +++ hw/xfree86/common/xf86Config.c 2010-09-03 16:45:21.057252713 -0700 |
25 --- a/hw/xfree86/common/xf86Config.c |
26 @@ -2045,7 +2045,7 @@ configMonitor(MonPtr monitorp, XF86ConfM |
26 +++ b/hw/xfree86/common/xf86Config.c |
|
27 @@ -2005,7 +2005,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor) |
27 cmodep = conf_monitor->mon_modeline_lst; |
28 cmodep = conf_monitor->mon_modeline_lst; |
28 while( cmodep ) { |
29 while( cmodep ) { |
29 mode = xnfcalloc(1, sizeof(DisplayModeRec)); |
30 mode = xnfcalloc(1, sizeof(DisplayModeRec)); |
30 - mode->type = 0; |
31 - mode->type = 0; |
31 + mode->type = M_T_USERDEF; |
32 + mode->type = M_T_USERDEF; |
32 mode->Clock = cmodep->ml_clock; |
33 mode->Clock = cmodep->ml_clock; |
33 mode->HDisplay = cmodep->ml_hdisplay; |
34 mode->HDisplay = cmodep->ml_hdisplay; |
34 mode->HSyncStart = cmodep->ml_hsyncstart; |
35 mode->HSyncStart = cmodep->ml_hsyncstart; |