xserver: Branch 'master'

[Ian Romanick]

 glx/glxcmds.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40a8f2f4088aa353de733a11327b628ef13a52e6
Author: Pierre Willenbrock <pierre at pirsoft.de>
Date:   Sun Apr 19 21:15:22 2009 +0200

    Fix obvious copypasta
    
    Reviewed-by: Ian Romanick <idr at freedesktop.org>

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 86e8dd8..1ae3151 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -799,8 +799,8 @@ int __glXDisp_WaitX(__GLXclientState *cl, GLbyte *pc)
 	    return error;
     }
 
-    if (glxc && glxc->drawPriv->waitGL)
-	(*glxc->drawPriv->waitGL)(glxc->drawPriv);
+    if (glxc && glxc->drawPriv->waitX)
+	(*glxc->drawPriv->waitX)(glxc->drawPriv);
 
     return Success;
 }