From a52d37219e8f32e5c6d2ee891c0774d0ae676a7a Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Sun, 29 Aug 2010 14:43:17 +0000
Subject: [PATCH] Update after module loader simplification upstreams. Fixes
 loading in xserver 1.8. ok miod@.

---
 .../src/wildcatfb_driver.c                     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c b/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
index facfadd99..2a8046334 100644
--- a/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
+++ b/driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wildcatfb_driver.c,v 1.6 2010/07/23 15:20:33 miod Exp $	*/
+/*	$OpenBSD: wildcatfb_driver.c,v 1.7 2010/08/29 14:43:17 matthieu Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -204,18 +204,6 @@ static const OptionInfoRec WildcatFBOptions[] = {
 	{ -1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
-/* Symbols needed from other modules. */
-static const char *fbSymbols[] = {
-	"fbPictureInit",
-	"fbScreenInit",
-	NULL
-};
-static const char *shadowSymbols[] = {
-	"shadowAdd",
-	"shadowSetup",
-	NULL
-};
-
 #ifdef XFree86LOADER
 static XF86ModuleVersionInfo WildcatFBVersRec = {
 	"wildcatfb",
@@ -252,7 +240,6 @@ WildcatFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 	if (!setupDone) {
 		setupDone = TRUE;
 		xf86AddDriver(&WILDCATFB, module, HaveDriverFuncs);
-		LoaderRefSymLists(fbSymbols, shadowSymbols, NULL);
 		return (pointer)1;
 	} else {
 		if (errmaj != NULL)
@@ -580,14 +567,11 @@ WildcatFBPreInit(ScrnInfoPtr pScrn, int flags)
 		WildcatFBFreeRec(pScrn);
 		return FALSE;
 	}
-	xf86LoaderReqSymLists(shadowSymbols, NULL);
 
 	if (xf86LoadSubModule(pScrn, "fb") == NULL) {
 		WildcatFBFreeRec(pScrn);
 		return FALSE;
 	}
-	xf86LoaderReqSymLists(fbSymbols, NULL);
-
 	TRACE_EXIT("PreInit");
 	return TRUE;
 }