xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 636a6382f80412ae4e28abe0cd9f98f84cd52291
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Oct 15 12:02:17 2014 +0900

    Remove duplicate OPTION_PAGE_FLIP entry
    
    Reported by 'amanual' on IRC

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 1703349..4666988 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -72,7 +72,6 @@ const OptionInfoRec RADEONOptions_KMS[] = {
     { OPTION_EXA_VSYNC,      "EXAVSync",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_EXA_PIXMAPS,    "EXAPixmaps",	 OPTV_BOOLEAN,   {0}, FALSE },
     { OPTION_ZAPHOD_HEADS,   "ZaphodHeads",      OPTV_STRING,  {0}, FALSE },
-    { OPTION_PAGE_FLIP,      "EnablePageFlip",   OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_SWAPBUFFERS_WAIT,"SwapbuffersWait", OPTV_BOOLEAN, {0}, FALSE },
     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
 };