xserver: Branch 'master'

[Chris Ball]

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

New commits:
commit 45e14f515337159e600a47ebf349692751552af8
Author: Chris Ball <cjb at laptop.org>
Date:   Fri Feb 13 20:32:02 2009 -0500

    Build fix for xf86EdidModes.c
    
    Commit 20ac314.. forgets to declare hsize/vsize/refresh.

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 3e62e7e..64f7fe9 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -471,7 +471,7 @@ DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,
 			   int timing_level, Bool rb)
 {
     DisplayModePtr Modes = NULL, Mode = NULL;
-    int i;
+    int i, hsize, vsize, refresh;
 
     for (i = 0; i < STD_TIMINGS; i++) {
 	hsize = timing[i].hsize;