Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / mesa / drivers / dri / sis / server / sis_dri.h

diff --git a/src/mesa/drivers/dri/sis/server/sis_dri.h b/src/mesa/drivers/dri/sis/server/sis_dri.h
index ce7c9a3114c44209e98354c6ef51338ec8a89d29..7d8f507115d5696540d59b18cf277f4c10d71810 100644 (file)
--- a/src/mesa/drivers/dri/sis/server/sis_dri.h
+++ b/src/mesa/drivers/dri/sis/server/sis_dri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.h,v 1.9 2003/08/29 08:50:54 twini Exp $ */
 
 /* modified from tdfx_dri.h */
 
@@ -6,6 +5,7 @@
 #define _SIS_DRI_
 
 #include "xf86drm.h"
+#include "drm.h"
 
 #define SIS_MAX_DRAWABLES 256
 #define SISIOMAPSIZE (64*1024)
@@ -37,7 +37,6 @@ typedef struct {
 typedef struct {
   drm_handle_t handle;
   drmSize size;
-  drmAddress map;
 } sisRegion, *sisRegionPtr;
 
 typedef struct {
@@ -73,13 +72,4 @@ typedef struct {
   int dummy;
 } SISDRIContextRec, *SISDRIContextPtr;
 
-#ifdef XFree86Server
-
-#include "screenint.h"
-
-Bool SISDRIScreenInit(ScreenPtr pScreen);
-void SISDRICloseScreen(ScreenPtr pScreen);
-Bool SISDRIFinishScreenInit(ScreenPtr pScreen);
-
-#endif
 #endif