xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_probe.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1038e29162d869e2ce37f9b8f5f7c8ea37c3e53d
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Nov 2 10:04:46 2012 -0400

    Revert "radeon/radeon_platform_probe: fix Zaphod mode breakage"
    
    This reverts commit 39eac3104c2f08b4d78aab3f88fd104301eb4711.
    
    This breaks non-zaphod configurations with xserver 1.13.
    See:
    https://bugs.freedesktop.org/show_bug.cgi?id=56680
    https://bugs.freedesktop.org/show_bug.cgi?id=56663

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index fef5d81..b1471af 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -278,7 +278,6 @@ radeon_platform_probe(DriverPtr pDriver,
 	scr_flags = XF86_ALLOCATE_GPU_SCREEN;
 
     pScrn = xf86AllocateScreen(pDriver, scr_flags);
-    xf86SetEntityShared(entity_num);
     xf86AddEntityToScreen(pScrn, entity_num);
 
     if (!radeon_kernel_mode_enabled(pScrn, dev->pdev))