summaryrefslogtreecommitdiff
path: root/driver/xf86-video-savage/src/savage_hwmc.c
diff options
context:
space:
mode:
Diffstat (limited to 'driver/xf86-video-savage/src/savage_hwmc.c')
-rw-r--r--driver/xf86-video-savage/src/savage_hwmc.c5
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;