use stand-alone drivers for each chip family.

Do not load the ati wrapper when the user specifies the sub-driver name in
the Driver line of xorg.conf.  Also, for -configure cause the wrapper to fail
and let each sub-driver speak for themselves.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/atimisc.c b/src/atimisc.c
index d71b0ad4..cf2347a3 100644
--- a/src/atimisc.c
+++ b/src/atimisc.c
@@ -27,6 +27,7 @@
 #include "ati.h"
 #include "ativersion.h"
 
+#include "atimach64probe.h"
 #include "atimach64version.h"
 
 /* Module loader interface for subsidiary driver module */
@@ -63,9 +64,8 @@ ATISetup
 
     if (!Inited)
     {
-        /* Ensure main driver module is loaded, but not as a submodule */
-        if (!xf86ServerIsOnlyDetecting() && !LoaderSymbol(ATI_NAME))
-            xf86LoadOneModule(ATI_DRIVER_NAME, Options);
+        if (xf86ServerIsOnlyDetecting() || !LoaderSymbol(ATI_NAME))
+            xf86AddDriver(&MACH64, Module, 0);
 
         Inited = TRUE;
     }