diff options
author | Doug Rabson <dfr@freebsd.org> | 2000-06-13 15:33:21 +0000 |
---|---|---|
committer | Doug Rabson <dfr@freebsd.org> | 2000-06-13 15:33:21 +0000 |
commit | c2795393281e915c53b347eba0a427d4d375a1ac (patch) | |
tree | 52ee0302ab3420a7e95a7b751f2e69876918886b /linux/i810_drv.h | |
parent | 46f2275dab156b302192865bb618107ef4e9a286 (diff) |
Merge trunk into bsd-1-0-1-branch.bsd-1-0-1-20000613bsd-1-0-1-branch
Diffstat (limited to 'linux/i810_drv.h')
-rw-r--r-- | linux/i810_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/i810_drv.h b/linux/i810_drv.h index 334cacb2..c387bf72 100644 --- a/linux/i810_drv.h +++ b/linux/i810_drv.h @@ -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,10 +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> + * Authors: Rickard E. (Rik) Faith <faith@valinux.com> + * Jeff Hartmann <jhartmann@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h,v 1.1 2000/02/11 17:26:05 dawes Exp $ */ #ifndef _I810_DRV_H_ |