-diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
-index 92d0f6d..a33366a 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
-@@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
+@@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86
XF86XVScreenPtr ScreenPriv;
XvScreenPtr pxvs;
return FALSE;
if (Success != XvScreenInit(pScreen))
-diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
-index 78a32bf..a0f6fcd 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen,