summaryrefslogtreecommitdiff
path: root/linux/ioctl.c
diff options
context:
space:
mode:
authorDoug Rabson <dfr@freebsd.org>2000-06-13 15:33:21 +0000
committerDoug Rabson <dfr@freebsd.org>2000-06-13 15:33:21 +0000
commitc2795393281e915c53b347eba0a427d4d375a1ac (patch)
tree52ee0302ab3420a7e95a7b751f2e69876918886b /linux/ioctl.c
parent46f2275dab156b302192865bb618107ef4e9a286 (diff)
Merge trunk into bsd-1-0-1-branch.bsd-1-0-1-20000613bsd-1-0-1-branch
Diffstat (limited to 'linux/ioctl.c')
-rw-r--r--linux/ioctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/ioctl.c b/linux/ioctl.c
index 8edfb437..b246f76e 100644
--- a/linux/ioctl.c
+++ b/linux/ioctl.c
@@ -1,8 +1,8 @@
/* ioctl.c -- IOCTL processing for DRM -*- linux-c -*-
* Created: Fri Jan 8 09:01:26 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 09:27:02 1999 by faith@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
@@ -24,7 +24,8 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c,v 1.2 2000/02/23 04:47:29 martin Exp $
+ * Authors:
+ * Rickard E. (Rik) Faith <faith@valinux.com>
*
*/