xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 3d7888aa0493f46d826f4d80dea36f1f642f3c6b
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 23 15:26:15 2009 +1000

    radeon: fix warning in printf

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e624f86..f149e0c 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -458,9 +458,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	if (info->exa_low_vram_threshhold_mb < 0 ||
 	    info->exa_low_vram_threshhold_mb > (info->vram_size * 1024 * 1024)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Illegal Low VRAM limit selected %d, total %lld\n",
+		       "Illegal Low VRAM limit selected %d, total %u\n",
 		       info->exa_low_vram_threshhold_mb,
-		       info->vram_size / (1024*1024));
+		       (unsigned int)(info->vram_size / (1024*1024)));
 	    info->exa_low_vram_threshhold_mb = 32;
 	}
     }