xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit a9df4bb555fd91707a68794c2dce24fb06e6cf64
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec 4 12:17:29 2007 +1100

    xf86Crtc: pass correct parameter.
    
    quite how this has worked I've no idea.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index fc80f52..a237a4c 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2186,7 +2186,7 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
     xf86MonPtr mon;
 
     mon = xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus);
-    xf86DDCApplyQuirks (scrn->scrnIndex, pDDCBus);
+    xf86DDCApplyQuirks (scrn->scrnIndex, mon);
 
     return mon;
 }