diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-10-23 02:58:30 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-10-23 02:58:30 +0300 |
| commit | c5b5b046e86b159a9d32451308f38246cc4587f7 (patch) | |
| tree | 2144d266963f2d03bc02b5767f0387efbf8c3d2e /hw/xfree86/utils | |
| parent | fab1d37ecbeee9777ad1485b0cc62b55042d5014 (diff) | |
| parent | 948a97b97e93cee05a23f1f1ae699c5e181bc8ce (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
Diffstat (limited to 'hw/xfree86/utils')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Cards | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 74647fdb7..04b0ce6cb 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -1116,6 +1116,7 @@ CardConfig(void) static char *xdrivers[] = { "apm", "ark", + "ast", "ati", "r128", "radeon", diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index bf30eab1d..b95928c37 100644 --- a/hw/xfree86/utils/xorgconfig/Cards +++ b/hw/xfree86/utils/xorgconfig/Cards @@ -51,6 +51,11 @@ NAME ** Ark Logic (generic) [ark] SERVER SVGA DRIVER ark +NAME ** ASPEED Technology (generic) [ast] +#CHIPSET ast +SERVER SVGA +DRIVER ast + NAME ** ATI (generic) [ati] #CHIPSET ati SERVER SVGA |