diff options
Diffstat (limited to 'src/atimisc.c')
| -rw-r--r-- | src/atimisc.c | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/src/atimisc.c b/src/atimisc.c index 7deda6e9..d71b0ad4 100644 --- a/src/atimisc.c +++ b/src/atimisc.c @@ -27,6 +27,8 @@ #include "ati.h" #include "ativersion.h" +#include "atimach64version.h" + /* Module loader interface for subsidiary driver module */ static XF86ModuleVersionInfo ATIVersionRec = @@ -36,7 +38,7 @@ static XF86ModuleVersionInfo ATIVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - ATI_VERSION_MAJOR, ATI_VERSION_MINOR, ATI_VERSION_PATCH, + MACH64_VERSION_MAJOR, MACH64_VERSION_MINOR, MACH64_VERSION_PATCH, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, @@ -62,38 +64,8 @@ ATISetup if (!Inited) { /* Ensure main driver module is loaded, but not as a submodule */ - if (!xf86ServerIsOnlyDetecting()) - { - if (!LoaderSymbol(ATI_NAME)) - xf86LoadOneModule(ATI_DRIVER_NAME, Options); - - /* ati & mach64 module versions must match */ - do - { - XF86ModuleData *pModuleData = LoaderSymbol("atiModuleData"); - - if (pModuleData) - { - XF86ModuleVersionInfo *pModuleInfo = pModuleData->vers; - - if ((pModuleInfo->majorversion == ATI_VERSION_MAJOR) && - (pModuleInfo->minorversion == ATI_VERSION_MINOR) && - (pModuleInfo->patchlevel == ATI_VERSION_PATCH)) - break; - } - - xf86Msg(X_ERROR, - "\"ati\" and \"mach64\" module versions must" - " match.\n"); - - if (ErrorMajor) - *ErrorMajor = (int)LDR_MISMATCH; - if (ErrorMinor) - *ErrorMinor = (int)LDR_MISMATCH; - - return NULL; - } while (0); - } + if (!xf86ServerIsOnlyDetecting() && !LoaderSymbol(ATI_NAME)) + xf86LoadOneModule(ATI_DRIVER_NAME, Options); Inited = TRUE; } |