Fri Jun 11 05:40:51 EST 2004

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/loader
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/loader

Modified Files:
	aout.h aoutloader.c aoutloader.h ar.h coff.h coffloader.c 
	coffloader.h dixsym.c dlloader.c dlloader.h elf.h elfloader.c 
	elfloader.h extsym.c fontsym.c hash.c hash.h loader.c loader.h 
	loaderProcs.h loadext.c loadfont.c loadmod.c misym.c os.c 
	os2funcs.c sym.h xf86sym.c 
Log Message:
Initial import from modular sources.


Index: aout.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/aout.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- aout.h	23 Apr 2004 19:54:06 -0000	1.2
+++ aout.h	10 Jun 2004 19:40:44 -0000	1.3
@@ -32,10 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _AOUT_H
 #define _AOUT_H
 
-#include "Xos.h"
+#include <X11/Xos.h>
 
 /* Get prototype for ntohl. */
 #include <ctype.h>

Index: aoutloader.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/aoutloader.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aoutloader.c	23 Apr 2004 19:54:06 -0000	1.2
+++ aoutloader.c	10 Jun 2004 19:40:44 -0000	1.3
@@ -25,6 +25,9 @@
  *
  * Modified 21/02/97 by Sebastien Marineau to support OS/2 a.out objects
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -44,7 +47,7 @@
 #define Xfree(size) free(size)
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 #include "aout.h"
 

Index: aoutloader.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/aoutloader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aoutloader.h	23 Apr 2004 19:54:06 -0000	1.2
+++ aoutloader.h	10 Jun 2004 19:40:44 -0000	1.3
@@ -21,6 +21,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _AOUTLOADER_H
 #define _AOUTLOADER_H
 extern void *AOUTLoadModule(loaderPtr, int, LOOKUP **);

Index: ar.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/ar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ar.h	23 Apr 2004 19:54:06 -0000	1.2
+++ ar.h	10 Jun 2004 19:40:44 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _AR_H
 #define _AR_H
 

Index: coff.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/coff.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- coff.h	23 Apr 2004 19:54:06 -0000	1.2
+++ coff.h	10 Jun 2004 19:40:44 -0000	1.3
@@ -16,6 +16,9 @@
    COFF, thein check out the book mentioned above.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _COFF_H
 #define _COFF_H
 

Index: coffloader.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/coffloader.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- coffloader.c	23 Apr 2004 19:54:06 -0000	1.2
+++ coffloader.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -22,6 +22,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -39,7 +42,7 @@
 #define Xfree(size) free(size)
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 #include "coff.h"
 

Index: coffloader.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/coffloader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- coffloader.h	23 Apr 2004 19:54:06 -0000	1.2
+++ coffloader.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -23,6 +23,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _COFFLOADER_H
 #define _COFFLOADER_H
 /* coffloader.c */

Index: dixsym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/dixsym.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixsym.c	23 Apr 2004 19:54:06 -0000	1.2
+++ dixsym.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -50,7 +50,12 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#define XResExtension
 #undef DBMALLOC
+#include "modularDefs.h"
 #include "sym.h"
 #include "colormap.h"
 #include "cursor.h"
@@ -67,12 +72,13 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "extension.h"
+#include "screenint.h"
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
 #include "swaprep.h"
 #include "swapreq.h"
 #include "inputstr.h"
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extinit.h"
 #ifdef XV

Index: dlloader.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/dlloader.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- dlloader.c	25 Nov 2003 19:28:49 -0000	1.1.1.2
+++ dlloader.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -25,11 +25,14 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 
 #include "sym.h"
@@ -131,11 +134,11 @@
     DLModuleList *l;
 
     if ((dlfile = xf86loadercalloc(1, sizeof(DLModuleRec))) == NULL) {
-	ErrorF("Unable  to allocate DLModuleRec\n");
+	ErrorF("Unable to allocate DLModuleRec\n");
 	return NULL;
     }
     dlfile->handle = modrec->handle;
-    dlfile->dlhandle = dlopen(modrec->name, DLOPEN_FLAGS);
+    dlfile->dlhandle = dlopen(modrec->name, RTLD_LAZY | RTLD_GLOBAL);
     if (dlfile->dlhandle == NULL) {
 	ErrorF("dlopen: %s\n", dlerror());
 	xf86loaderfree(dlfile);

Index: dlloader.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/dlloader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dlloader.h	23 Apr 2004 19:54:06 -0000	1.2
+++ dlloader.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -21,6 +21,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _DLLOADER_H
 #define _DLLOADER_H
 extern void *DLLoadModule(loaderPtr, int, LOOKUP **);

Index: elf.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/elf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elf.h	23 Apr 2004 19:54:06 -0000	1.2
+++ elf.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -15,6 +15,9 @@
 typedef long Elf64_Sxword;
 
 /* These constants are for the segment types stored in the image headers */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define PT_NULL    0
 #define PT_LOAD    1
 #define PT_DYNAMIC 2

Index: elfloader.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/elfloader.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elfloader.c	23 Apr 2004 19:54:06 -0000	1.2
+++ elfloader.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -23,6 +23,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #ifndef __UNIXOS2__
 #include <sys/mman.h>
@@ -46,7 +49,7 @@
 # define Xfree(size) free(size)
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 #include "elf.h"
 

Index: elfloader.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/elfloader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elfloader.h	23 Apr 2004 19:54:06 -0000	1.2
+++ elfloader.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -23,6 +23,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _ELFLOADER_H
 #define _ELFLOADER_H
 /* elfloader.c */

Index: extsym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/extsym.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extsym.c	23 Apr 2004 19:54:06 -0000	1.2
+++ extsym.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -25,6 +25,9 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "resource.h"
 #include "sym.h"
 #include "misc.h"

Index: fontsym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/fontsym.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- fontsym.c	29 Jan 2004 08:08:46 -0000	1.1.1.3
+++ fontsym.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "font.h"
 #include "sym.h"
 #include "fntfilst.h"

Index: hash.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/hash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hash.c	23 Apr 2004 19:54:06 -0000	1.2
+++ hash.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -24,8 +24,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "os.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 #undef abs
 #include <stdlib.h>
 #include "sym.h"

Index: hash.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/hash.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hash.h	23 Apr 2004 19:54:06 -0000	1.2
+++ hash.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -23,6 +23,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _HASH_H
 #define _HASH_H
 

Index: loader.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loader.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- loader.c	23 Apr 2004 19:54:06 -0000	1.2
+++ loader.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -48,6 +48,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -334,7 +337,9 @@
     LoaderAddSymbols(-1, -1, miLookupTab);
     LoaderAddSymbols(-1, -1, xfree86LookupTab);
     LoaderAddSymbols(-1, -1, dixLookupTab);
+#if 0 /* XXX DS */
     LoaderAddSymbols(-1, -1, fontLookupTab);
+#endif
     LoaderAddSymbols(-1, -1, extLookupTab);
 #if defined(__sparc__) && !defined(__FreeBSD__)
 #ifdef linux
@@ -951,6 +956,12 @@
     int i;
     int numsyms = 0;
 
+#ifndef ARCHIVE_SUPPORT
+    /* we don't want archive support (usually to prefer libdl), so just null out
+     * here. -d */
+    return NULL;
+#endif
+
     /* lookup_ret = xf86loadermalloc(sizeof (LOOKUP *)); */
 
     arnamesize = strlen(modrec->name);

Index: loader.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loader.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- loader.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ loader.h	10 Jun 2004 19:40:45 -0000	1.2
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _LOADER_H
 #define _LOADER_H
 

Index: loaderProcs.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loaderProcs.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- loaderProcs.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ loaderProcs.h	10 Jun 2004 19:40:45 -0000	1.2
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _LOADERPROCS_H
 #define _LOADERPROCS_H
 

Index: loadext.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loadext.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- loadext.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ loadext.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -28,6 +28,9 @@
 
 /* Maybe this file belongs elsewhere? */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define LOADERDECLARATIONS
 #include "loaderProcs.h"
 #include "misc.h"

Index: loadfont.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loadfont.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- loadfont.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ loadfont.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -28,6 +28,9 @@
 
 /* Maybe this file belongs in lib/font/fontfile/module/ ? */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define LOADERDECLARATIONS
 #include "loaderProcs.h"
 #include "misc.h"

Index: loadmod.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/loadmod.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- loadmod.c	23 Apr 2004 19:54:06 -0000	1.2
+++ loadmod.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "os.h"
 /* For stat() and related stuff */
 #define NO_OSLIB_PROTOTYPES
@@ -220,11 +223,15 @@
  */
 static PatternRec stdPatterns[] = {
     {"^lib(.*)\\.so$",},
+#ifdef ARCHIVE_SUPPORT
     {"^lib(.*)\\.a$",},
+#endif
     {"(.*)_drv\\.so$",},
     {"(.*)_drv\\.o$",},
     {"(.*)\\.so$",},
+#ifdef ARCHIVE_SUPPORT
     {"(.*)\\.a$",},
+#endif
     {"(.*)\\.o$",},
     {NULL,}
 };

Index: misym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/misym.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misym.c	23 Apr 2004 19:54:06 -0000	1.2
+++ misym.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -51,6 +51,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sym.h"
 #include "misc.h"
 #include "mi.h"

Index: os.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/os.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- os.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ os.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "loaderProcs.h"
 
 /*

Index: os2funcs.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/os2funcs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- os2funcs.c	23 Apr 2004 19:54:06 -0000	1.2
+++ os2funcs.c	10 Jun 2004 19:40:45 -0000	1.3
@@ -33,6 +33,9 @@
  * the requests. We create a heap of 2 megs, hopefully enough for now.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define I_NEED_OS2_H
 #define INCL_DOSMEMMGR
 #include <os2.h>

Index: sym.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/sym.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sym.h	23 Apr 2004 19:54:06 -0000	1.2
+++ sym.h	10 Jun 2004 19:40:45 -0000	1.3
@@ -23,6 +23,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _SYM_H
 #define _SYM_H
 

Index: xf86sym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/xf86sym.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86sym.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ xf86sym.c	10 Jun 2004 19:40:45 -0000	1.2
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define INCLUDE_DEPRECATED 1
 
 #include <fcntl.h>
@@ -74,6 +77,7 @@
 #include "xf86xvmc.h"
 #include "xf86cmap.h"
 #include "xf86fbman.h"
+#include "fbdevhw.h"
 #include "dgaproc.h"
 #include "dpmsproc.h"
 #include "vidmodeproc.h"
@@ -252,15 +256,19 @@
     SYMFUNC(xf86MapDomainMemory)
     SYMFUNC(xf86MapDomainIO)
     SYMFUNC(xf86ReadDomainMemory)
+#if 0 /* XXX DS */
     SYMFUNC(xf86UDelay)
     SYMFUNC(xf86IODelay)
+#endif
     SYMFUNC(xf86SlowBcopy)
 #ifdef __alpha__
     SYMFUNC(xf86SlowBCopyToBus)
     SYMFUNC(xf86SlowBCopyFromBus)
 #endif
+#if 0 /* XXX DS */
     SYMFUNC(xf86BusToMem)
     SYMFUNC(xf86MemToBus)
+#endif
     SYMFUNC(xf86OpenSerial)
     SYMFUNC(xf86SetSerial)
     SYMFUNC(xf86SetSerialSpeed)
@@ -275,7 +283,9 @@
     SYMFUNC(xf86GetSerialModemState)
     SYMFUNC(xf86SerialModemSetBits)
     SYMFUNC(xf86SerialModemClearBits)
+#if 0 /* XXX DS */
     SYMFUNC(xf86LoadKernelModule)
+#endif
     SYMFUNC(xf86OSMouseInit)
     SYMFUNC(xf86OSKbdPreInit)
     SYMFUNC(xf86AgpGARTSupported)
@@ -1144,5 +1154,8 @@
     /* Pci.c */
     SYMVAR(pciNumBuses)
 
+    /* fbdevhw.c */
+    SYMVAR(fbdevHWValidMode)
+
     {0, 0}
 };


