[PATCH] xfree86: Don't fixup for atimisc anymore.

Jesse Adkins jesserayadkins at gmail.com
Sun Sep 12 23:01:50 PDT 2010


atimisc was replaced by mach64 a couple years ago, and isn't going to
come back. Might as well remove the fixup now.

v2: Keep atimisc in the registry, since the namespace has been used.

Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
---
 hw/xfree86/common/xf86Config.c |   19 -------------------
 1 files changed, 0 insertions(+), 19 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 **
-- 
1.7.0.4



More information about the xorg-devel mailing list