[PATCH xserver] xfree86: Don't fixup for atimisc anymore.
Jesse Adkins
jesserayadkins at gmail.com
Sun Sep 12 08:01:05 PDT 2010
atimisc has been dead for a couple years, when mach64 was made. It's not
coming back, so might as well remove the fixup for it now.
Remove it from the xf86 registry too.
Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
---
hw/xfree86/common/xf86Config.c | 19 -------------------
hw/xfree86/doc/devel/Registry | 1 -
2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 28786ba..6071f93 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -504,7 +504,6 @@ fixup_video_driver_list(char **drivers)
static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
char **end, **drv;
char *x;
- char **ati, **atimisc;
int i;
/* walk to the end of the list */
@@ -524,24 +523,6 @@ fixup_video_driver_list(char **drivers)
}
}
}
- /*
- * since the ati wrapper driver is gross and awful, sort ati before
- * atimisc, which makes sure all the ati symbols are visible in xorgcfg.
- */
- for (drv = drivers; drv != end; drv++) {
- if (!strcmp(*drv, "atimisc")) {
- atimisc = drv;
- for (drv = atimisc; drv != end; drv++) {
- if (!strcmp(*drv, "ati")) {
- ati = drv;
- x = *ati; *ati = *atimisc; *atimisc = x;
- return;
- }
- }
- /* if we get here, ati was already ahead of atimisc */
- return;
- }
- }
}
static char **
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index 1fec230..bba49b0 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -12,7 +12,6 @@ afb
apm
ark
ati
-atimisc
bitmap
bt8xx
calcomp
--
1.7.0.4
More information about the xorg-devel
mailing list