diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-18 19:55:24 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-18 19:55:24 +0000 |
| commit | a5c2c453907206e94b464a7afdf8f12b0c585213 (patch) | |
| tree | 6961895225ac61d5e9cb1e9d41c3c77922a0622b /driver/xf86-video-mach64 | |
| parent | 6a74649e60d5f7b3d17cf7ff88d4de39179c3a24 (diff) | |
Don't unload sub-modules with xserver 1.12
Diffstat (limited to 'driver/xf86-video-mach64')
| -rw-r--r-- | driver/xf86-video-mach64/src/atipreinit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/driver/xf86-video-mach64/src/atipreinit.c b/driver/xf86-video-mach64/src/atipreinit.c index 07987b8c0..7636969e5 100644 --- a/driver/xf86-video-mach64/src/atipreinit.c +++ b/driver/xf86-video-mach64/src/atipreinit.c @@ -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) |