diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-03-04 10:59:24 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-04 10:59:24 -0500 |
| commit | 95df04b744c6a3498a9a9e2ea9bb03ee780e60f8 (patch) | |
| tree | b0c5cb17eceb752591e301d1e41cfb0fb3fa90ed | |
| parent | 056a2ce02ce85013e89055ee44a7aa3eabedac09 (diff) | |
Remove all mention of the vga driver from the config logic.
| -rw-r--r-- | hw/xfree86/common/xf86AutoConfig.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index da6c3f38d..e3e0bb3a3 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -82,7 +82,6 @@ static int builtinLines = 0; static const char *deviceList[] = { "fbdev", "vesa", - "vga", NULL }; @@ -450,8 +449,6 @@ chooseVideoDriver(void) if (chosen_driver == NULL) { #if defined __i386__ || defined __amd64__ || defined __hurd__ chosen_driver = "vesa"; -#elif defined __alpha__ - chosen_driver = "vga"; #elif defined __sparc__ chosen_driver = "sunffb"; #else diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index de3edf638..635a88c91 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -494,7 +494,7 @@ xf86InputDriverlistFromConfig() static void fixup_video_driver_list(char **drivers) { - static const char *fallback[5] = { "vga", "vesa", "fbdev", "wsfb", NULL }; + static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL }; char **end, **drv; char *x; char **ati, **atimisc; |