diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-08 14:38:22 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-08 14:38:22 +0000 |
commit | 569da5a42ebf10c86d6c6ba81866a888e1c708dc (patch) | |
tree | 3ce7f6e098ef6f66114eac85106f64f32b336fa5 /linux/i810_drv.c | |
parent | 5ce0f2afec70a1d062b749e1bf7150c21d35281d (diff) |
Merged glxmisc-3-0-0glxmisc-3-0-0-20000608-merge
Diffstat (limited to 'linux/i810_drv.c')
-rw-r--r-- | linux/i810_drv.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/i810_drv.c b/linux/i810_drv.c index 75b402da..b523db90 100644 --- a/linux/i810_drv.c +++ b/linux/i810_drv.c @@ -2,6 +2,7 @@ * Created: Mon Dec 13 01:56:22 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,8 @@ * 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> - * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c,v 1.1 2000/02/11 17:26:05 dawes Exp $ + * Authors: Rickard E. (Rik) Faith <faith@valinux.com> + * Jeff Hartmann <jhartmann@valinux.com> * */ @@ -41,9 +40,9 @@ EXPORT_SYMBOL(i810_cleanup); #define I810_NAME "i810" #define I810_DESC "Intel I810" #define I810_DATE "19991213" -#define I810_MAJOR 0 +#define I810_MAJOR 1 #define I810_MINOR 0 -#define I810_PATCHLEVEL 1 +#define I810_PATCHLEVEL 0 static drm_device_t i810_device; drm_ctx_t i810_res_ctx; |