xserver: Branch 'master'

[Dave Airlie]

 exa/exa.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa18c569ed26d2fdd442af6b39723cb7e30d18df
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Tue Jun 9 09:14:50 2009 +1000

    exa: driver pixmaps enabled if either CreatePixmap or CreatePixmap2 present

diff --git a/exa/exa.c b/exa/exa.c
index 089350b..d04ea71 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -1190,7 +1190,7 @@ exaDriverInit (ScreenPtr		pScreen,
 	return FALSE;
     }
 
-    if (!pScreenInfo->CreatePixmap) {
+    if (!pScreenInfo->CreatePixmap && !pScreenInfo->CreatePixmap2) {
 	if (!pScreenInfo->memoryBase) {
 	    LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::memoryBase "
 		       "must be non-zero\n", pScreen->myNum);