summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Io.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-05-29 11:14:03 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-05-29 11:14:03 +0000
commitfd8bde8bb0f9d796b3464973b53285c0a6d22a31 (patch)
tree3ca147e3cb1bad4dfe698e2a129cf731f8c27b8e /hw/xfree86/common/xf86Io.c
parentdb0680cf70b8367e1f8a7fff9c0f6ec414db0542 (diff)
Remove -xkbmap argument.
Diffstat (limited to 'hw/xfree86/common/xf86Io.c')
-rw-r--r--hw/xfree86/common/xf86Io.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c
index 4e1dc4b0f..4dbbd7e93 100644
--- a/hw/xfree86/common/xf86Io.c
+++ b/hw/xfree86/common/xf86Io.c
@@ -49,7 +49,7 @@
*/
/* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.5 2005/07/03 07:01:24 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.6 2006/03/25 19:52:03 ajax Exp $ */
#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
@@ -369,12 +369,6 @@ xf86KbdProc (pKeyboard, what)
XkbDescPtr desc;
Bool foundTerminate = FALSE;
int keyc;
- if (XkbInitialMap) {
- if ((xf86Info.xkbkeymap = strchr(XkbInitialMap, '/')) != NULL)
- xf86Info.xkbkeymap++;
- else
- xf86Info.xkbkeymap = XkbInitialMap;
- }
if (xf86Info.xkbkeymap) {
names.keymap = xf86Info.xkbkeymap;
names.keycodes = NULL;