xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86Crtc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41bd8d5dfe27d5c91fe7e4cdba1475a2a0741b1c
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 25 11:27:26 2008 -0400

    EDID: Build fix.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 6ceb426..21e7dd2 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2633,8 +2633,8 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
     {
 	if (edid_mon->ver.version == 1) {
 	    size = 128;
-	    if (edid->flags & EDID_COMPLETE_RAWDATA)
-		size += edid->no_sections * 128;
+	    if (edid_mon->flags & EDID_COMPLETE_RAWDATA)
+		size += edid_mon->no_sections * 128;
 	} else if (edid_mon->ver.version == 2)
 	    size = 256;
     }