xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/modeline2c.awk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 10 09:14:20 2008 -0400

    Bug #14927: Fix the math for xf86NumDefaultModes.

diff --git a/hw/xfree86/common/modeline2c.awk b/hw/xfree86/common/modeline2c.awk
index ca32e2f..71a956e 100644
--- a/hw/xfree86/common/modeline2c.awk
+++ b/hw/xfree86/common/modeline2c.awk
@@ -92,5 +92,5 @@ BEGIN {
 
 END {
 	print "};"
-	printf "const int xf86NumDefaultModes = sizeof(xf86NumDefaultModes) / sizeof(DisplayModeRec);"
+	printf "const int xf86NumDefaultModes = sizeof(xf86DefaultModes) / sizeof(DisplayModeRec);"
 }