diff options
| author | Ian Romanick <idr@us.ibm.com> | 2003-01-26 07:43:50 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2003-01-26 07:43:50 +0000 |
| commit | 3163f74b8eddf97bc9a71f01dfa02d2d33091b62 (patch) | |
| tree | cf0741bf2f3dabe273f2dfaf698891ea19a4c2bc /linux/drmP.h | |
| parent | a790687c9a4b369094a2a56e29a8240db573a54a (diff) | |
Merge from trunk.texmem-0-0-1-20030125-trunk-merge
Diffstat (limited to 'linux/drmP.h')
| -rw-r--r-- | linux/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drmP.h b/linux/drmP.h index 3f51b9b00..010450370 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -488,7 +488,6 @@ typedef struct drm_agp_mem { typedef struct drm_agp_head { agp_kern_info agp_info; - const char *chipset; drm_agp_mem_t *memory; unsigned long mode; int enabled; @@ -593,6 +592,7 @@ typedef struct drm_device { atomic_t vbl_received; spinlock_t vbl_lock; drm_vbl_sig_t vbl_sigs; + unsigned int vbl_pending; #endif cycles_t ctx_start; cycles_t lck_start; |