diff --git a/src/xgi.h b/src/xgi.h
index 80cf23f..707b8f4 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -189,10 +189,6 @@ extern Bool g_bRunTimeDebug;
 #define XGI_XINERAMA_MAJOR_VERSION  1
 #define XGI_XINERAMA_MINOR_VERSION  1
 
-#if 0				/* Include YPbPr support on VB  */
-#define ENABLE_YPBPR
-#endif
-
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"  	/* required */
 #include <X11/extensions/panoramiXproto.h>  	/* required */
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 523d186..f00bb11 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -3206,12 +3206,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
         pXGI->XGI_SD_Flags |= XGI_SD_SUPPORTTV;
     }
 
-#ifdef ENABLE_YPBPR
-    if (pXGI->XGI_Pr->VBType & (VB_XGI301 | VB_XGI301B | VB_XGI302B)) {
-        pXGI->XGI_SD_Flags |= XGI_SD_SUPPORTHIVISION;
-    }
-#endif
-
 #ifdef TWDEBUG                  /* @@@ TEST @@@ */
     pXGI->XGI_SD_Flags |= XGI_SD_SUPPORTYPBPRAR;
     xf86DrvMsg(0, X_INFO, "TEST: Support Aspect Ratio\n");