xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_kms.c   |    2 +-
 src/radeon_video.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 56c7fb8ada4cd9cf096c6b06a8d368d286d74e68
Author: Thomas DeRensis <tderensis at gmail.com>
Date:   Wed Sep 10 21:20:32 2014 -0400

    radeon: fix build warnings regarding const qualifier
    
    Signed-off-by: Thomas DeRensis <tderensis at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 6f0f1a1..1703349 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1209,7 +1209,7 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
     ScrnInfoPtr    pScrn = xf86ScreenToScrn(pScreen);
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
     int            subPixelOrder = SubPixelUnknown;
-    char*          s;
+    const char *s;
     void *front_ptr;
 
     pScrn->fbOffset = 0;
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 5349d11..cbfd554 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -188,7 +188,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
 
     if(texturedAdaptor) {
-	XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, texturedAdaptor->name);
+	XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, (char *)texturedAdaptor->name);
 	if(xvmcAdaptor) {
 	    if(!xf86XvMCScreenInit(pScreen, 1, &xvmcAdaptor))
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Failed to initialize extension.\n");