Disable legacy keyboard driver "keyboard", unless

    USE_DEPRECATED_KEYBOARD_DRIVER is defined. Print warning if the old
    driver is used.

2 files changed, 18 insertions, 3 deletions

diff --git a/xorg.cf b/xorg.cf
index 2daa422..e2b622c 100644
--- a/xorg.cf
+++ b/xorg.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.13 2004/07/23 05:36:14 anholt Exp $
+XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.14 2004/07/23 17:53:33 anholt Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the Xorg based X Servers.
@@ -214,6 +214,12 @@ RELEASE_VERSION = ReleaseVersion
 				palmax OSXInputDrivers ExtraXInputDrivers
 #endif
 
+
+/* Deprecated keyboard driver */
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver NO
+#endif
+
 /* <linux/input.h> support mainly for USB support */
 #ifndef HasLinuxInput
 # define HasLinuxInput NO
diff --git a/xorgsite.def b/xorgsite.def
index 05d2f5e..c6a6b0a 100644
--- a/xorgsite.def
+++ b/xorgsite.def
@@ -120,12 +120,21 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 				wacom void magictouch aiptek
  */
 
-/* To enable building of development DRI drivers (insecure, or not useful on the
- * chosen architecture, uncomment this define.
+/* To enable building of development DRI drivers (insecure, or not
+ * useful on the chosen architecture, uncomment this define.
 #define BuildDevelDRIDrivers YES
  */
 
 /*
+ * To use the deprecated, old keyboard driver, uncomment this.  But
+ * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
+ * work for your architechture.  The old driver will be removed in the
+ * next release.
+ *
+#define UseDeprecatedKeyboardDriver YES
+ */
+
+/*
  * There are three parameters that determine where and how the Matrox HAL
  * library is used:
  *