summaryrefslogtreecommitdiff
path: root/linux/drmP.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-06-08 14:38:22 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-06-08 14:38:22 +0000
commit569da5a42ebf10c86d6c6ba81866a888e1c708dc (patch)
tree3ce7f6e098ef6f66114eac85106f64f32b336fa5 /linux/drmP.h
parent5ce0f2afec70a1d062b749e1bf7150c21d35281d (diff)
Merged glxmisc-3-0-0glxmisc-3-0-0-20000608-merge
Diffstat (limited to 'linux/drmP.h')
-rw-r--r--linux/drmP.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drmP.h b/linux/drmP.h
index 43670e28..350d1ef9 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -1,7 +1,8 @@
/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
*
- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * 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,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/drmP.h,v 1.6 2000/02/23 04:47:27 martin Exp $
+ * Authors:
+ * Rickard E. (Rik) Faith <faith@valinux.com>
*
*/
@@ -528,6 +530,7 @@ typedef struct drm_device {
/* Misc. support (init.c) */
extern int drm_flags;
extern void drm_parse_options(char *s);
+extern int drm_cpu_valid(void);
/* Device support (fops.c) */