xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit e7cd5d84ed1fb3637dce6e9e6ef58c8611818c4e
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 7 16:09:17 2008 +1000

    fixup another calloc build issue

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index d61f59e..85cd5b6 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -538,7 +538,7 @@ configureModuleSection (void)
 	for (el = elist; *el; el++) {
 	    XF86LoadPtr module;
 
-    	    module = xf86confcalloc(sizeof(XF86LoadRec));
+    	    module = xf86confcalloc(1, sizeof(XF86LoadRec));
     	    module->load_name = *el;
 
             /* Add only those font backends which are referenced by fontpath */