diff options
| author | Kevin E Martin <kem@kem.org> | 2000-02-22 22:10:28 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2000-02-22 22:10:28 +0000 |
| commit | d9ff0e3884abd19cdf99426d4d4b1e8f17b4ffd1 (patch) | |
| tree | edbbb7a93e0b330843ca2b14e8ce356f7173dab6 /linux-core | |
| parent | 7a9b291ab55dd9dcfeb35217f6105ad57c94f433 (diff) | |
3.9.18 merge
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 4 | ||||
| -rw-r--r-- | linux-core/tdfx_drv.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 0d5f7b8f..25c35425 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1,6 +1,6 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Mon Dec 6 16:06:49 1999 by faith@precisioninsight.com + * Revised: Sun Feb 13 23:34:30 2000 by kevin@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.5 2000/02/14 06:27:26 martin Exp $ * */ diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 769d7adf..61c917eb 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -25,7 +25,7 @@ * DEALINGS IN THE SOFTWARE. * * $PI$ - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.2 2000/01/20 07:25:36 martin Exp $ * */ @@ -53,7 +53,7 @@ static struct file_operations tdfx_fops = { mmap: drm_mmap, read: drm_read, fasync: drm_fasync, - poll: drm_poll + poll: drm_poll, }; static struct miscdevice tdfx_misc = { |