xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/atimach64xv.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 46a0254b5a0bffe8c57322b085bcd38f893e4b27
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Sep 9 10:32:48 2008 -0400

    Make sure the screen is a mach64 screen before doing anything in ATIMach64XVInitialiseAdaptor.

diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index ef17861..21cd890 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -31,6 +31,7 @@
 #include "atimach64accel.h"
 #include "atimach64io.h"
 #include "atixv.h"
+#include "atimach64version.h"
 
 #include <X11/extensions/Xv.h>
 #include "fourcc.h"
@@ -1358,6 +1359,9 @@ ATIMach64XVInitialiseAdaptor
     XF86OffscreenImagePtr surf0 = &(ATIMach64Surface[0]);
     XF86OffscreenImagePtr surf1 = &(ATIMach64Surface[1]);
 
+    if (xf86NameCmp(pScreenInfo->driverName, MACH64_DRIVER_NAME) != 0)
+	return 0;
+
     if (pppAdaptor)
         *pppAdaptor = NULL;