Index: git/dix/devices.c
===================================================================
--- git.orig/dix/devices.c	2007-11-14 17:16:41.000000000 +0000
+++ git/dix/devices.c	2007-11-14 17:38:39.000000000 +0000
@@ -527,8 +527,8 @@
 #ifdef XKB
 	if (dev->key->xkbInfo)
 	    XkbFreeInfo(dev->key->xkbInfo);
-#endif
         dev->key->xkbInfo = NULL;
+#endif
 	xfree(dev->key->curKeySyms.map);
 	xfree(dev->key->modifierKeyMap);
 	xfree(dev->key);