xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit 6a5c3e04fa43b98ccffd69ad86dd781602f88d0b
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 17 14:59:12 2007 +1000

    mi: set the private key to a unique non-zero value

diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index a1fb2e2..7ca5f5d 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -301,7 +301,7 @@ miAllocateGCPrivateIndex()
     return privateKey;
 }
 
-_X_EXPORT DevPrivateKey miZeroLineScreenKey;
+_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKey;
 
 _X_EXPORT void
 miSetZeroLineBias(pScreen, bias)