xserver: Branch 'master'

[Dodji Seketeli]

 hw/kdrive/src/kaa.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be0cbe5a330f62cef47fffbc49e83b5e1637b7d0
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Tue Nov 20 15:39:49 2007 +0100

    kaa: update kaaCreatePixmap to support the new usage_int

diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 9cf9bf2..0271630 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -314,7 +314,7 @@ kaaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
 	    }
     }
 
-    pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
+    pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp, usage_hint);
     if (!pPixmap)
 	return NULL;
     pKaaPixmap = KaaGetPixmapPriv(pPixmap);