xserver: Branch 'master'

[Dave Airlie]

 exa/exa.c           |    1 -
 exa/exa_accel.c     |    1 -
 exa/exa_migration.c |    1 -
 3 files changed, 3 deletions(-)

New commits:
commit 0466b8811ce8ebc1d993f177cbb7a22e997640f1
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Sep 1 09:57:25 2008 +1000

    exa: drop cw.h inclusion
    
    this doesn't seem to be needed, at least I can't see any warning without it.
    
    I'd like to build EXA into a driver and cw.h isn't exported

diff --git a/exa/exa.c b/exa/exa.c
index 2ceee51..1d0d23f 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -36,7 +36,6 @@
 
 #include "exa_priv.h"
 #include "exa.h"
-#include "cw.h"
 
 static int exaScreenPrivateKeyIndex;
 DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKeyIndex;
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 1c07a0b..522224b 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -34,7 +34,6 @@
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "exa.h"
-#include "cw.h"
 
 static void
 exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
diff --git a/exa/exa_migration.c b/exa/exa_migration.c
index 2f90b82..56b6945 100644
--- a/exa/exa_migration.c
+++ b/exa/exa_migration.c
@@ -34,7 +34,6 @@
 
 #include "exa_priv.h"
 #include "exa.h"
-#include "cw.h"
 
 #if DEBUG_MIGRATE
 #define DBG_MIGRATE(a) ErrorF a