summaryrefslogtreecommitdiff
path: root/linux/mga_dma.c
diff options
context:
space:
mode:
authorDaryll Strauss <daryll@users.sourceforge.net>2000-06-09 02:29:41 +0000
committerDaryll Strauss <daryll@users.sourceforge.net>2000-06-09 02:29:41 +0000
commit5d122e6a09d0b956cab6c351f282373140dfbfee (patch)
tree04832c5c1faa38c7d4ddd2f33431f0c1c2cd2b35 /linux/mga_dma.c
parentfc6568f03bfbb49a7447010061d8daf68563571a (diff)
Merge the latest version of the trunk into my tdfx-2-0 branch.tdfx-2-0-20000608-mergetdfx-2-0-branch
Diffstat (limited to 'linux/mga_dma.c')
-rw-r--r--linux/mga_dma.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index fe6a7b525..25e3622ca 100644
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -2,6 +2,7 @@
* Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,11 +24,9 @@
* 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>
- * Jeff Hartmann <jhartmann@precisioninsight.com>
- * Keith Whitwell <keithw@precisioninsight.com>
- *
- * $XFree86$
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * Jeff Hartmann <jhartmann@valinux.com>
+ * Keith Whitwell <keithw@valinux.com>
*
*/