diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index eca52df04..88d5e2705 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -274,9 +274,6 @@ extern _X_EXPORT void
 xf86SetBackingStore(ScreenPtr pScreen);
 extern _X_EXPORT void
 xf86SetSilkenMouse(ScreenPtr pScreen);
-extern _X_EXPORT void *
-xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, const char *port_name,
-                  const char **adaptor_name, void **adaptor_options);
 extern _X_EXPORT ScrnInfoPtr
 xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
                    int entityIndex, EntityProc init,
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 93c2fc8e6..a666aeeef 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1570,36 +1570,6 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
                    pScrn->silkenMouse ? "enabled" : "disabled");
 }
 
-/* Wrote this function for the PM2 Xv driver, preliminary. */
-
-void *
-xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, const char *port_name,
-                  const char **adaptor_name, void **adaptor_options)
-{
-    confXvAdaptorPtr adaptor;
-    int i;
-
-    if (adaptor_index >= pScrn->confScreen->numxvadaptors) {
-        if (adaptor_name)
-            *adaptor_name = NULL;
-        if (adaptor_options)
-            *adaptor_options = NULL;
-        return NULL;
-    }
-
-    adaptor = &pScrn->confScreen->xvadaptors[adaptor_index];
-    if (adaptor_name)
-        *adaptor_name = adaptor->identifier;
-    if (adaptor_options)
-        *adaptor_options = adaptor->options;
-
-    for (i = 0; i < adaptor->numports; i++)
-        if (!xf86NameCmp(adaptor->ports[i].identifier, port_name))
-            return adaptor->ports[i].options;
-
-    return NULL;
-}
-
 static void
 xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
                            EntityProc enter, EntityProc leave, void *private)