summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2000-09-23 21:25:26 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2000-09-23 21:25:26 +0000
commitb1aa228f7d7390f8b9a361f862d724b908d5a71f (patch)
treed9e7c7124ba09ae9c64eac71d96c0a5633080c5d
parent881683873e6aeab6529b8e6db8ed0678c87e86d7 (diff)
Import of XFree86 4.0.1d-pre (2)X_4_0_1d-pre
-rw-r--r--linux/sis_context.c2
-rw-r--r--linux/sis_ds.c4
-rw-r--r--linux/sis_ds.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/linux/sis_context.c b/linux/sis_context.c
index df66268c5..e13bd8531 100644
--- a/linux/sis_context.c
+++ b/linux/sis_context.c
@@ -30,7 +30,7 @@
* Sung-Ching Lin <sclin@sis.com.tw>
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_context.c,v 1.5 2000/08/28 02:43:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_context.c,v 1.3 2000/09/22 11:35:47 alanh Exp $ */
#define __NO_VERSION__
#include "drmP.h"
diff --git a/linux/sis_ds.c b/linux/sis_ds.c
index 525d16a60..a946a41f1 100644
--- a/linux/sis_ds.c
+++ b/linux/sis_ds.c
@@ -27,7 +27,7 @@
* Sung-Ching Lin <sclin@sis.com.tw>
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.2 2000/09/22 11:35:47 alanh Exp $ */
#define __NO_VERSION__
#include <linux/module.h>
@@ -163,7 +163,7 @@ int setDestroy(set_t *set)
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.1 2000/08/01 20:52:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.c,v 1.2 2000/09/22 11:35:47 alanh Exp $ */
#define ISFREE(bptr) ((bptr)->free)
diff --git a/linux/sis_ds.h b/linux/sis_ds.h
index 2258b7553..59d58b8c6 100644
--- a/linux/sis_ds.h
+++ b/linux/sis_ds.h
@@ -27,7 +27,7 @@
* Sung-Ching Lin <sclin@sis.com.tw>
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_ds.h,v 1.3 2000/09/22 11:35:47 alanh Exp $ */
#ifndef _sis_ds_h_
#define _sis_ds_h_