xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/evergreen_exa.c |    3 ---
 src/r600_exa.c      |    3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 9fc16ff3f8806971cb495e8838af1e5f9149d34f
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Dec 3 02:04:28 2010 -0500

    radeon: remove duplicated define
    
    xfixedtofloat macro was defined several times

diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 19d52d8..42e2a4c 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -700,9 +700,6 @@ EVERGREENDoneCopy(PixmapPtr pDst)
 
 }
 
-
-#define xFixedToFloat(f) (((float) (f)) / 65536)
-
 struct blendinfo {
     Bool dst_alpha;
     Bool src_alpha;
diff --git a/src/r600_exa.c b/src/r600_exa.c
index c458991..15db42a 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -741,9 +741,6 @@ R600DoneCopy(PixmapPtr pDst)
 
 }
 
-
-#define xFixedToFloat(f) (((float) (f)) / 65536)
-
 struct blendinfo {
     Bool dst_alpha;
     Bool src_alpha;