diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-09-08 20:51:58 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-09-08 20:51:58 +0000 |
| commit | 4f0dd271841b68a05edab4d7bcfeeb6f4eb8e208 (patch) | |
| tree | 58a8cd73815b43282afcc158681589ddd7a14399 /driver/xf86-video-savage/src/savage_hwmc.c | |
| parent | eecea31b6dc87300fd264bcd7665f2610f848d59 (diff) | |
update to xf86-video-savage 2.3.6
Diffstat (limited to 'driver/xf86-video-savage/src/savage_hwmc.c')
| -rw-r--r-- | driver/xf86-video-savage/src/savage_hwmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/driver/xf86-video-savage/src/savage_hwmc.c b/driver/xf86-video-savage/src/savage_hwmc.c index ed881b4db..d1e555322 100644 --- a/driver/xf86-video-savage/src/savage_hwmc.c +++ b/driver/xf86-video-savage/src/savage_hwmc.c @@ -40,8 +40,9 @@ #include "xf86xvmc.h" #include <X11/extensions/Xv.h> #include <X11/extensions/XvMC.h> -#include "xaa.h" +#ifdef HAVE_XAA_H #include "xaalocal.h" +#endif #include "dixstruct.h" #include "fourcc.h" @@ -181,7 +182,7 @@ static XF86MCAdaptorPtr ppAdapt[1] = **************************************************************************/ Bool SAVAGEInitMC(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SavagePtr pSAVAGE = SAVPTR(pScrn); DRIInfoPtr pDRIInfo = pSAVAGE->pDRIInfo; SAVAGEDRIPtr pSAVAGEDriPriv = (SAVAGEDRIPtr)pDRIInfo->devPrivate; |