xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon.h     |    4 ----
 src/radeon_kms.c |    4 ----
 2 files changed, 8 deletions(-)

New commits:
commit 3c7d024c2671dac541b8f2daed55040f4fd5d62d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Dec 12 10:43:55 2012 +0100

    Remove dead option definitions.
    
    These were only used with UMS.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon.h b/src/radeon.h
index 9c2073f..13f224f 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -143,9 +143,7 @@ typedef enum {
     OPTION_NOACCEL,
     OPTION_SW_CURSOR,
     OPTION_PAGE_FLIP,
-    OPTION_ACCEL_DFS,
     OPTION_EXA_PIXMAPS,
-    OPTION_IGNORE_EDID,
     OPTION_COLOR_TILING,
     OPTION_COLOR_TILING_2D,
 #ifdef RENDER
@@ -153,8 +151,6 @@ typedef enum {
     OPTION_SUBPIXEL_ORDER,
 #endif
     OPTION_ACCELMETHOD,
-    OPTION_DRI,
-    OPTION_TVSTD,
     OPTION_EXA_VSYNC,
     OPTION_ZAPHOD_HEADS,
     OPTION_SWAPBUFFERS_WAIT
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index bb5ef43..8e8544e 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -65,15 +65,11 @@ const OptionInfoRec RADEONOptions_KMS[] = {
     { OPTION_NOACCEL,        "NoAccel",          OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_SW_CURSOR,      "SWcursor",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_PAGE_FLIP,      "EnablePageFlip",   OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_ACCEL_DFS,      "AccelDFS",         OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_IGNORE_EDID,    "IgnoreEDID",       OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_COLOR_TILING,   "ColorTiling",      OPTV_BOOLEAN, {0}, FALSE },
     { 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 },
     { OPTION_ACCELMETHOD,    "AccelMethod",      OPTV_STRING,  {0}, FALSE },
-    { OPTION_DRI,            "DRI",       	 OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_TVSTD,          "TVStandard",       OPTV_STRING,  {0}, FALSE },
     { OPTION_EXA_VSYNC,      "EXAVSync",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_EXA_PIXMAPS,    "EXAPixmaps",	 OPTV_BOOLEAN,   {0}, FALSE },
     { OPTION_ZAPHOD_HEADS,   "ZaphodHeads",      OPTV_STRING,  {0}, FALSE },