diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-07-21 16:33:28 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 16:33:28 -0400 |
| commit | 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4 (patch) | |
| tree | c0d8610aece1bd9e07c0ed2f734c83ad36794341 /hw/xfree86/utils/xorgcfg/keyboard-cfg.c | |
| parent | 60ea7b51fe2b8a19a08b63db48504971a7a50ee6 (diff) | |
bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/keyboard-cfg.c')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 2e82323be..dc457366e 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -38,8 +38,7 @@ #include <X11/Xaw/SimpleMenu.h> #include <X11/Xaw/SmeBSB.h> -#define IS_KBDDRIV(X) ((strcasecmp((X),"kbd") == 0) || \ - (strcasecmp((X), "keyboard") == 0)) +#define IS_KBDDRIV(X) ((strcasecmp((X),"kbd") == 0) /* * Types @@ -255,11 +254,7 @@ KeyboardConfig(XtPointer config) keyboard = XtNew(XF86ConfInputRec); keyboard->list.next = NULL; keyboard->inp_identifier = XtNewString(ident_string); -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - keyboard->inp_driver = XtNewString("keyboard"); -#else keyboard->inp_driver = XtNewString("kbd"); -#endif keyboard->inp_option_lst = xf86newOption(XtNewString(XkbRules), XtNewString(rules)); xf86addNewOption(keyboard->inp_option_lst, |