diff options
| author | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-11-13 20:32:26 -0600 |
|---|---|---|
| committer | Jeremy C. Reed <reed@glacier.reedmedia.net> | 2006-11-13 20:32:26 -0600 |
| commit | a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf (patch) | |
| tree | 29351ae423e57d20f3c54623667b1a5d4ea7c8e3 /hw/xfree86/utils/xorgcfg/text-mode.c | |
| parent | 6facd958c2e7098cb68eac2810a88b8cd40f19c0 (diff) | |
| parent | f80a8ae6e6820378ea70ac0849cee8bf3055e0e8 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/text-mode.c')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 0430a5463..9797ca283 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -46,8 +46,7 @@ #include "xf86config.h" #include "loader.h" -#define IS_KBDDRIV(X) ((strcmp((X),"kbd") == 0) || \ - (strcmp((X), "keyboard") == 0)) +#define IS_KBDDRIV(X) ((strcmp((X),"kbd") == 0)) #ifndef PROJECT_ROOT #define PROJECT_ROOT "/usr" @@ -362,9 +361,6 @@ static char *protocols[] = { #ifdef __SCO__ "OsMouse", #endif -#ifdef __UNIXWARE__ - "Xqueue", -#endif #ifdef WSCONS_SUPPORT "wsmouse", #endif @@ -744,11 +740,7 @@ KeyboardConfig(void) input->inp_option_lst = xf86addNewOption(input->inp_option_lst, XtNewString("XkbLayout"), XtNewString("us")); -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - input->inp_driver = XtNewString("keyboard"); -#else input->inp_driver = XtNewString("kbd"); -#endif XF86Config->conf_input_lst = xf86addInput(XF86Config, input); } @@ -824,11 +816,7 @@ KeyboardConfig(void) XtNewString("XkbLayout"), XtNewString(layout)); if (input->inp_driver == NULL) { -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - input->inp_driver = XtNewString("keyboard"); -#else input->inp_driver = XtNewString("kbd"); -#endif XF86Config->conf_input_lst = xf86addInput(XF86Config->conf_input_lst, input); } @@ -1128,6 +1116,7 @@ CardConfig(void) static char *xdrivers[] = { "apm", "ark", + "ast", "ati", "r128", "radeon", |