Don't unload sub-modules with xserver 1.12

This commit is contained in:
matthieu
2012-06-18 19:55:23 +00:00
parent ca98827488
commit 2f68a08887

View File

@@ -716,11 +716,14 @@ ATIPreInit
#ifndef TV_OUT
/* De-activate VBE */
vbeFree(pVBE);
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
xf86UnloadSubModule(pVBEModule);
#endif
/* De-activate int10 */
xf86FreeInt10(pInt10Info);
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
xf86UnloadSubModule(pInt10Module);
#endif
#else
pATI->pInt10 = pInt10Info;
pATI->pVBE = pVBE;
@@ -735,8 +738,9 @@ ATIPreInit
}
/* DDC module is no longer needed at this point */
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
xf86UnloadSubModule(pDDCModule);
#endif
#endif /* AVOID_CPIO */
if (flags & PROBE_DETECT)