xserver: Branch 'master'

[James Cloos]

 hw/xfree86/utils/xorgcfg/config.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 92b0a04ffd630a89705fc73d587182a62c34cd84
Author: James Cloos <cloos at jhcloos.com>
Date:   Sat Jul 19 18:21:37 2008 -0400

    Fix compile failure
    
    This fixes a compile failure by ensuring that mouse-cfg.c
    can see the MTYPE_ constants.

diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index ea12e88..ddbb055 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -74,6 +74,7 @@
 #include <X11/extensions/XKBfile.h>
 #include <X11/extensions/XKBui.h>
 #include <X11/extensions/XKBrules.h>
+#include <X11/extensions/xf86misc.h>
 
 #ifndef _xf86cfg_config_h
 #define _xf86cfg_config_h