xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Init.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree b879356ce96929d02bcb75b9aa24b17ac7e28125 (from 4ed311cf1c29090c53e474a3001c5702ff8409df)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Aug 24 15:50:15 2006 -0400

    More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index cd072f5..408536d 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -135,7 +135,8 @@ static int numFormats = 6;
 #endif
 static Bool formatsDone = FALSE;
 
-InputDriverRec XF86KEYBOARD = {
+#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
+static InputDriverRec XF86KEYBOARD = {
 	1,
 	"keyboard",
 	NULL,
@@ -144,6 +145,7 @@ InputDriverRec XF86KEYBOARD = {
 	NULL,
 	0
 };
+#endif
 
 static Bool
 xf86CreateRootWindow(WindowPtr pWin)