xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/ddc/print_edid.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c1a845521a31f08938b0f8d6e38835ce127c94a
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Aug 28 12:09:57 2009 -0400

    EDID: Print 1152x864 in established timings, not x870
    
    The spec says x870, but we actually use x864 because that's a real DMT
    mode and x870 isn't.  This might or might not be wrong, but we should at
    least tell the truth.

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index cebca47..85c67d7 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -251,7 +251,7 @@ print_established_timings(int scrnIndex, struct established_timings *t)
     if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"1024x768 at 75Hz\n");
     if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"1280x1024 at 75Hz\n");
     c=t->t_manu;
-    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x870 at 75Hz\n");
+    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x864 at 75Hz\n");
     xf86DrvMsg(scrnIndex,X_INFO,"Manufacturer's mask: %X\n",c&0x7F);
 }