mesa: Branch 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nouveau_screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 254ce75ac300d8d20ba4e2fce81c4459c692d2b1 (from b6becfae1087f2577b489677bdd680d64a7ffb4c)
Author: Ben Skeggs <darktama at iinet.net.au>
Date:   Tue Jan 2 15:09:10 2007 +1100

    nouveau: bump drm patchlevel.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 97bca84..0e3901c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -320,7 +320,7 @@ void * __driCreateNewScreen_20050727( __
 	__DRIscreenPrivate *psp;
 	static const __DRIversion ddx_expected = { 1, 2, 0 };
 	static const __DRIversion dri_expected = { 4, 0, 0 };
-	static const __DRIversion drm_expected = { 0, 0, 1 };
+	static const __DRIversion drm_expected = { 0, 0, 2 };
 
 	dri_interface = interface;