Import of XFree86 4.0.1d-pre

7 files changed, 12 insertions, 12 deletions

diff --git a/xc/programs/Xserver/hw/kdrive/trio/Imakefile b/xc/programs/Xserver/hw/kdrive/trio/Imakefile
index 5ba216aea..5bb00863b 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/Imakefile
+++ b/xc/programs/Xserver/hw/kdrive/trio/Imakefile
@@ -1,14 +1,13 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/trio/Imakefile,v 1.1 1999/11/19 13:54:02 hohndel Exp $
-#include <Server.tmpl>
+XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
+KDRIVE=..
+#include "../Kdrive.tmpl"
 
 SRCS = 	s3.c s3clock.c s3cmap.c s3curs.c s3draw.c s3gc.c s3stub.c
 
 OBJS = 	s3.o s3clock.o s3cmap.o s3curs.o s3draw.o s3gc.o s3stub.o
 
-INCLUDES = -I.. -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
-	   -I../../../fb -I../../../mi -I../../../include -I../../../os  \
-           -I$(EXTINCSRC) -I$(XINCLUDESRC)
+INCLUDES = -I. $(KDINCS)
 
 DEFINES = -DS3_TRIO
 
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3.c b/xc/programs/Xserver/hw/kdrive/trio/s3.c
index 476e406fe..e79d899a2 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3.c
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.5 2000/08/09 17:52:45 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */
 
 #include "s3.h"
 
@@ -636,7 +636,7 @@ s3Preserve (KdCardInfo *card)
  * Enable the card for rendering.  Manipulate the initial settings
  * of the card here.
  */
-void
+Bool
 s3Enable (ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
@@ -904,6 +904,7 @@ s3Enable (ScreenPtr pScreen)
     LockS3 (s3c);
     _s3SetDepth (s3c->s3, crtc);
     UnlockS3 (s3c);
+    return TRUE;
 }
 
 void
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3.h b/xc/programs/Xserver/hw/kdrive/trio/s3.h
index 50a6d7c5a..81131c996 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3.h
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3.h
@@ -1126,7 +1126,7 @@ typedef struct _s3ScreenInfo {
 
 Bool	s3CardInit (KdCardInfo *);
 Bool	s3ScreenInit (KdScreenInfo *);
-void	s3Enable (ScreenPtr pScreen);
+Bool	s3Enable (ScreenPtr pScreen);
 void	s3Disable (ScreenPtr pScreen);
 void	s3Fini (ScreenPtr pScreen);
 
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3clock.c b/xc/programs/Xserver/hw/kdrive/trio/s3clock.c
index c44decab8..94a9688a7 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3clock.c
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3clock.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
 
 #include "s3.h"
 
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3cmap.c b/xc/programs/Xserver/hw/kdrive/trio/s3cmap.c
index 4a3391924..01035e8d7 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3cmap.c
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3cmap.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.3 2000/05/06 22:17:53 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */
 
 #include "s3.h"
 
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3curs.c b/xc/programs/Xserver/hw/kdrive/trio/s3curs.c
index 54a1cf80c..f67b77b4a 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3curs.c
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3curs.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.4 2000/05/06 22:17:53 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
 
 #include "s3.h"
 #include "s3draw.h"
diff --git a/xc/programs/Xserver/hw/kdrive/trio/s3stub.c b/xc/programs/Xserver/hw/kdrive/trio/s3stub.c
index 750d49ccd..f7605d50d 100644
--- a/xc/programs/Xserver/hw/kdrive/trio/s3stub.c
+++ b/xc/programs/Xserver/hw/kdrive/trio/s3stub.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.2 1999/12/30 03:03:20 robin Exp $ */
 
 #include "s3.h"