[PATCH 1/2 xf86-input-keyboard] Don't use XKB_DFLT_RULES from the server.

[Peter Hutterer]

On Linux, the server uses default rules of "evdev" which doesn't apply for
this driver. For all other cases, the server uses "base", so let's just
hardcode it here too.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/kbd.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/kbd.c b/src/kbd.c
index c86c2fc..b2e858f 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -113,12 +113,6 @@ static const OptionInfoRec KeyboardOptions[] = {
     { -1,			NULL,		  OPTV_NONE,	{0}, FALSE }
 };
 
-/* Xorg 1.6 and earlier put the default XKB rules file in __XKBDEFRULES__
-   in xorg-server.h, later versions switched to XKB_DFLT_RULES */
-#if !defined(XKB_DFLT_RULES) && defined(__XKBDEFRULES__)
-# define XKB_DFLT_RULES __XKBDEFRULES__
-#endif
-
 static const char *kbdDefaults[] = {
 #ifdef XQUEUE 
     "Protocol",		"Xqueue",
@@ -126,7 +120,7 @@ static const char *kbdDefaults[] = {
     "Protocol",		"standard",
 #endif
     "AutoRepeat",	"500 30",
-    "XkbRules",		XKB_DFLT_RULES,
+    "XkbRules",		"base",
     "XkbModel",		"pc105",
     "XkbLayout",	"us",
     "CustomKeycodes",	"off",
-- 
1.6.3.rc1.2.g0164.dirty