xserver: Branch 'master'

[Adam Jackson]

 exa/exa.h      |    2 ++
 exa/exa_priv.h |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 21 13:10:44 2008 -0400

    exa: Add exaDrawableIsOffscreen() to the driver API.

diff --git a/exa/exa.h b/exa/exa.h
index 8d9bcea..5982e1a 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -789,6 +789,8 @@ ExaOffscreenMarkUsed (PixmapPtr pPixmap);
 void
 exaEnableDisableFBAccess (int index, Bool enable);
 
+Bool
+exaDrawableIsOffscreen (DrawablePtr pDrawable);
 
 /* in exa_migration.c */
 void
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index bd3c76e..078dc37 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -405,9 +405,6 @@ exaGetDrawableDeltas (DrawablePtr pDrawable, PixmapPtr pPixmap,
 		      int *xp, int *yp);
 
 Bool
-exaDrawableIsOffscreen (DrawablePtr pDrawable);
-
-Bool
 exaPixmapIsOffscreen(PixmapPtr p);
 
 PixmapPtr