From 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 5 Jul 2006 13:26:34 -0700
Subject: [PATCH] fix compiler warning in hw/xfree86/common/xf86Config.c

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

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index d9f1dd903..bcad246f5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -75,6 +75,7 @@ extern DeviceAssocRec mouse_assoc;
 #endif
 
 #ifdef XKB
+#undef XKB_IN_SERVER
 #define XKB_IN_SERVER
 #include <X11/extensions/XKBsrv.h>
 #endif