xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1ff383360886c5cee1bb75abcc20675aca0336a6
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Tue Aug 12 12:27:12 2014 -0400

    radeon: fix warnings when building against older xservers
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 171d919..6f0f1a1 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -584,7 +584,9 @@ static Bool RADEONPreInitChipType_KMS(ScrnInfoPtr pScrn)
 static int radeon_get_drm_master_fd(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info   = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+#endif
     struct pci_device *dev = info->PciInfo;
     char *busid;
     int fd;
@@ -1116,7 +1118,9 @@ static Bool RADEONSaveScreen_KMS(ScreenPtr pScreen, int mode)
 static Bool radeon_set_drm_master(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+#endif
     int err;
 
 #ifdef XF86_PDEV_SERVER_FD
@@ -1135,9 +1139,9 @@ static Bool radeon_set_drm_master(ScrnInfoPtr pScrn)
 static void radeon_drop_drm_master(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
 
-#ifdef XF86_PDEV_SERVER_FD
     if (pRADEONEnt->platform_dev &&
             (pRADEONEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
         return;