From 00aa236cbc6575b78d2e23a8f0dbc8a84103ee09 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 17 Nov 2006 14:22:00 -0800
Subject: [PATCH] Eliminate all occurances of EMI.

---
 src/xgi.h     | 1 -
 src/xgi_opt.c | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/src/xgi.h b/src/xgi.h
index f6aa4d1..f0831a9 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -887,7 +887,6 @@ typedef struct {
     int			xgi6326yfilterstrong;
     int			xgi6326tvplug;
     int			xgi6326fscadjust;
-    int			EMI;
 
     int			NoYV12;			/* Disable Xv YV12 support (old series) */
     int			newFastVram;		/* Replaces FastVram */
diff --git a/src/xgi_opt.c b/src/xgi_opt.c
index 9bc2a47..c593728 100644
--- a/src/xgi_opt.c
+++ b/src/xgi_opt.c
@@ -66,12 +66,10 @@ typedef enum {
     OPTION_VESA,
     OPTION_MAXXFBMEM,
     OPTION_FORCECRT1,
-    OPTION_XVONCRT2,
     OPTION_PDC,
     OPTION_PDCA,
     OPTION_PDCS,
     OPTION_PDCAS,
-    OPTION_EMI,
     OPTION_TVSTANDARD,
     OPTION_USEROMDATA,
     OPTION_NOINTERNALMODES,
@@ -179,7 +177,6 @@ static const OptionInfoRec XGIOptions[] = {
     { OPTION_PDCA,               	"PanelDelayCompensation1",OPTV_INTEGER,   {0}, -1    },
     { OPTION_PDCS,               	"PDC", 			  OPTV_INTEGER,   {0}, -1    },
     { OPTION_PDCAS,               	"PDC1",			  OPTV_INTEGER,   {0}, -1    },
-    { OPTION_EMI,               	"EMI", 			  OPTV_INTEGER,   {0}, -1    },
     { OPTION_LVDSHL,			"LVDSHL", 	  	  OPTV_INTEGER,   {0}, -1    },
     { OPTION_SPECIALTIMING,        	"SpecialTiming",          OPTV_STRING,    {0}, -1    },
     { OPTION_TVSTANDARD,        	"TVStandard",             OPTV_STRING,    {0}, -1    },
@@ -317,7 +314,6 @@ xgiOptions(ScrnInfoPtr pScrn)
     pXGI->NoYV12 = -1;
     pXGI->PDC = -1;
     pXGI->PDCA = -1;
-    pXGI->EMI = -1;
     pXGI->OptTVStand = -1;
     pXGI->OptROMUsage = -1;
     pXGI->noInternalModes = FALSE;
@@ -544,9 +540,6 @@ xgiOptions(ScrnInfoPtr pScrn)
           (xf86GetOptValInteger(pXGI->Options, OPTION_PDCAS, &vali))) {
           xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "PanelDelayCompensation1 (PDC1)");
        }
-       if(xf86GetOptValInteger(pXGI->Options, OPTION_EMI, &vali)) {
-          xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "EMI");
-       }
        if(xf86GetOptValString(pXGI->Options, OPTION_SPECIALTIMING)) {
           xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "SpecialTiming");
        }