xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_mergedfb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree dabffb8335027b60ca1fc554423e196dfb9acd6d (from 831fc4a009841f68fe161b6e0db5b212d7d8079b)
Author: Henry Zhao <henry.zhao at sun.com>
Date:   Tue Oct 17 21:17:47 2006 -0400

    improved results for mergedfb xrandr refresh rates - bug 6966

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 94ac942..820ba4b 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -215,8 +215,8 @@ RADEONCopyModeNLink(ScrnInfoPtr pScrn, D
       * extension to allow selecting among a number of modes whose merged result
       * looks identical but consists of different modes for CRT1 and CRT2
       */
-    mode->VRefresh = (i->Clock * 1000.0 / i->HTotal / i->VTotal) * 100 +
-	(j->Clock * 1000.0 / j->HTotal / j->VTotal);
+    mode->VRefresh = (float)((i->Clock * 1000.0 / i->HTotal / i->VTotal) * 100 +
+	(j->Clock * 1000.0 / j->HTotal / j->VTotal));
 
     mode->Clock = (int)(mode->VRefresh * 0.001 * mode->HTotal * mode->VTotal);