xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_probe.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e1b9cb9ea665eaa84e64a386299efa0819d55df4
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 2 17:18:47 2009 +1000

    radeon: fix compile without kms

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 38fe0b0..4f7d494 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -135,6 +135,7 @@ radeon_get_scrninfo(int entity_num, void *pci_dev)
     pScrn->Probe         = RADEONProbe;
 #endif
 
+#ifdef XF86DRM_MODE
     if (kms == 1) {
       pScrn->PreInit       = RADEONPreInit_KMS;
       pScrn->ScreenInit    = RADEONScreenInit_KMS;
@@ -144,7 +145,8 @@ radeon_get_scrninfo(int entity_num, void *pci_dev)
       pScrn->LeaveVT       = RADEONLeaveVT_KMS;
       pScrn->FreeScreen    = RADEONFreeScreen_KMS;
       pScrn->ValidMode     = RADEONValidMode;
-    } else {
+    } else 
+#endif {
       pScrn->PreInit       = RADEONPreInit;
       pScrn->ScreenInit    = RADEONScreenInit;
       pScrn->SwitchMode    = RADEONSwitchMode;