xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
diff-tree c81ed9bd7b37c9d02141d10f6c7bad3d0c57032f (from 406eec71116a58d42288a7f1c809a92d5bda7350)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Apr 21 18:58:40 2007 +1000

    radeon: fix build on older server

diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index 3d147e2..1a63971 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -186,9 +186,11 @@ static DisplayModePtr RADEONDDCModes(Scr
 	    new->status     = MODE_OK;
 #ifdef M_T_PREFERRED
 	    if (PREFERRED_TIMING_MODE(ddc->features.msc))
-	      new->type     = M_T_PREFERRED;
+	      new->type     |= M_T_PREFERRED;
 #endif
+#ifdef M_T_DRIVER
 	      new->type     |= M_T_DRIVER;
+#endif
 
 	    switch (d_timings->misc) {
 	    case 0: new->Flags |= V_NHSYNC | V_NVSYNC; break;