xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_atombios.c |    2 +-
 src/radeon_macros.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 284e1943f6726ed08e796f99e49fbd90ac7fa8a4
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Apr 1 15:07:01 2009 -0400

    Cast info->sclk to int

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 47f5103..a657fac 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1398,7 +1398,7 @@ xf86MonPtr radeon_atom_get_edid(xf86OutputPtr output)
     AtomBiosArgRec data;
     unsigned char *space;
     int i2c_clock = 50;
-    int engine_clk = info->sclk * 100;
+    int engine_clk = (int)info->sclk * 100;
     int prescale;
     unsigned char *edid;
     xf86MonPtr mon = NULL;
commit b580e388e0e31843308c783c1ca859672dc6ca0e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Apr 1 14:59:43 2009 -0400

    Fix missing ')' in PCIE macro

diff --git a/src/radeon_macros.h b/src/radeon_macros.h
index b7056b0..19307c8 100644
--- a/src/radeon_macros.h
+++ b/src/radeon_macros.h
@@ -155,6 +155,6 @@ do {									\
 #define OUTMC(pScrn, addr, val) RADEONOUTMC(pScrn, addr, val)
 
 #define INPCIE(pScrn, addr) RADEONINPCIE(pScrn, addr)
-#define OUTPCIE(pScrn, addr, val) RADEONOUTPCIE(pScrn, addr, val
+#define OUTPCIE(pScrn, addr, val) RADEONOUTPCIE(pScrn, addr, val)
 
 #endif