From 2dc7b5e0d96a187bfbb355caa788f0fdcd88eaad Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 13 Feb 2006 04:43:40 +0000
Subject: [PATCH] Move call to xf86WrapperInit() to OsVendorInit() in
 xf86Init.c and remove     stubs in other DDX.

---
 ChangeLog                    | 10 ++++++++++
 hw/kdrive/src/kdrive.c       |  4 +---
 hw/vfb/InitOutput.c          |  3 ---
 hw/xfree86/common/xf86Init.c |  5 +++--
 hw/xnest/Init.c              |  3 ---
 os/osinit.c                  |  7 -------
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd30630fe..b4c5ab336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-13  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+	* hw/kdrive/src/kdrive.c: (ddxInitGlobals):
+	* hw/vfb/InitOutput.c:
+	* hw/xfree86/common/xf86Init.c: (OsVendorInit):
+	* hw/xnest/Init.c:
+	* os/osinit.c: (OsInit):
+	Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and
+	remove stubs in other DDX.
+
 2006-02-12  Eric Anholt  <anholt@FreeBSD.org>
 
 	reviewed by: keithp (in principle)
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index db087f0a7..dabce5481 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1,7 +1,7 @@
 /*
  * $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $ 
  *
- * Copyright © 1999 Keith Packard
+ * Copyright © 1999 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -1514,6 +1514,4 @@ DPMSSupported (void)
 #endif
 
 void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }
-void xf86WrapperInit(void);
-void xf86WrapperInit(void) { /* THANK YOU XFREE86 */ }
 
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index be9768545..a7d50db19 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -1043,6 +1043,3 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 #ifdef AIXV3
 int SelectWaitTime = 10000; /* usec */
 #endif
-
-void xf86WrapperInit(void);
-void xf86WrapperInit(void) { /* THANKS XFREE86 */ }
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index b73da71dc..6e357dbc9 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.29 2005/12/14 20:11:16 ajax Exp $ */
 
 /*
  * Loosely based on code bearing the following copyright:
@@ -1170,7 +1170,8 @@ OsVendorInit()
 {
   static Bool beenHere = FALSE;
 
-  /* xf86WrapperInit() is called directly from OsInit() */
+  xf86WrapperInit();
+
 #ifdef SIGCHLD
   signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
 #endif
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index ce603e603..dcbd724fd 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -161,6 +161,3 @@ void ddxBeforeReset(void)
 #ifdef AIXV3
 int SelectWaitTime = 10000; /* usec */
 #endif
-
-void xf86WrapperInit(void);
-void xf86WrapperInit(void) { /* THANKS XFREE86 */ }
diff --git a/os/osinit.c b/os/osinit.c
index ea99ace21..4e502830a 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -94,10 +94,6 @@ int limitNoFile = -1;
 
 Bool OsDelayInitColors = FALSE;
 
-#ifdef XFree86LOADER
-extern void xf86WrapperInit(void);
-#endif
-
 void
 OsInit(void)
 {
@@ -111,9 +107,6 @@ OsInit(void)
 #endif
 
     if (!been_here) {
-#ifdef XFree86LOADER
-	xf86WrapperInit();
-#endif
 #if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
 	fclose(stdin);
 	fclose(stdout);