summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/sis_drv.c7
-rw-r--r--linux/sis_drm.h (renamed from linux/sis_drm_public.h)0
-rw-r--r--linux/sis_drv.c7
-rw-r--r--linux/sis_drv.h5
-rw-r--r--linux/sis_mm.c2
5 files changed, 3 insertions, 18 deletions
diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index c04561ee..5dda149a 100644
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -1,5 +1,4 @@
/* sis.c -- sis driver -*- linux-c -*-
- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
*
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* All Rights Reserved.
@@ -23,15 +22,11 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * Rickard E. (Rik) Faith <faith@precisioninsight.com>
- * Daryll Strauss <daryll@precisioninsight.com>
- *
*/
#include <linux/config.h>
#include "drmP.h"
-#include "sis_drm_public.h"
+#include "sis_drm.h"
#include "sis_drv.h"
#define SIS_NAME "sis"
diff --git a/linux/sis_drm_public.h b/linux/sis_drm.h
index dd14a5a5..dd14a5a5 100644
--- a/linux/sis_drm_public.h
+++ b/linux/sis_drm.h
diff --git a/linux/sis_drv.c b/linux/sis_drv.c
index c04561ee..5dda149a 100644
--- a/linux/sis_drv.c
+++ b/linux/sis_drv.c
@@ -1,5 +1,4 @@
/* sis.c -- sis driver -*- linux-c -*-
- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
*
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* All Rights Reserved.
@@ -23,15 +22,11 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * Rickard E. (Rik) Faith <faith@precisioninsight.com>
- * Daryll Strauss <daryll@precisioninsight.com>
- *
*/
#include <linux/config.h>
#include "drmP.h"
-#include "sis_drm_public.h"
+#include "sis_drm.h"
#include "sis_drv.h"
#define SIS_NAME "sis"
diff --git a/linux/sis_drv.h b/linux/sis_drv.h
index 50f6efad..24523b8f 100644
--- a/linux/sis_drv.h
+++ b/linux/sis_drv.h
@@ -1,5 +1,4 @@
/* sis_drv.h -- Private header for sis driver -*- linux-c -*-
- * Created: Thu Oct 7 10:40:04 1999 by faith@precisioninsight.com
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* All rights reserved.
@@ -23,10 +22,6 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * Rickard E. (Rik) Faith <faith@precisioninsight.com>
- * Daryll Strauss <daryll@precisioninsight.com>
- *
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.h,v 1.2 2000/08/04 03:51:47 tsi Exp $ */
diff --git a/linux/sis_mm.c b/linux/sis_mm.c
index 1d6a2748..333b5196 100644
--- a/linux/sis_mm.c
+++ b/linux/sis_mm.c
@@ -2,7 +2,7 @@
#define __NO_VERSION__
#include "drmP.h"
-#include "sis_drm_public.h"
+#include "sis_drm.h"
#include "sis_ds.h"
#include "sis_drv.h"
#include <linux/fb.h>