xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_kms.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ac335eaae135c0e66cc4643908f41174e2f1123
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Mar 8 17:37:41 2013 +0100

    Only parse Option "AccelMethod" if glamor was enabled at build time
    
    Will hopefully make it more obvious when it wasn't.

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 0dc577b..cacdf8e 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -69,7 +69,9 @@ const OptionInfoRec RADEONOptions_KMS[] = {
     { OPTION_COLOR_TILING_2D,"ColorTiling2D",    OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_RENDER_ACCEL,   "RenderAccel",      OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_SUBPIXEL_ORDER, "SubPixelOrder",    OPTV_ANYSTR,  {0}, FALSE },
+#ifdef USE_GLAMOR
     { OPTION_ACCELMETHOD,    "AccelMethod",      OPTV_STRING,  {0}, FALSE },
+#endif
     { OPTION_EXA_VSYNC,      "EXAVSync",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_EXA_PIXMAPS,    "EXAPixmaps",	 OPTV_BOOLEAN,   {0}, FALSE },
     { OPTION_ZAPHOD_HEADS,   "ZaphodHeads",      OPTV_STRING,  {0}, FALSE },