summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2000-05-11 15:08:46 +0000
committerKevin E Martin <kem@kem.org>2000-05-11 15:08:46 +0000
commit3f84bbb3c1d3721f95f248634d1871be3ffa005e (patch)
tree1ea68e63e54a0aca44596554a37a9ce7f282aed9 /linux
parentb093c88f3884301348c2f5934d4a59e7b61b6905 (diff)
- Merge trunk into ati branchvideo-1-0-0-branch
- Fix texture allocation to use both AGP and local textures (still need to fix LRU algorithm to choose from both local and AGP heaps for texture swapping)
Diffstat (limited to 'linux')
-rw-r--r--linux/drm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drm.h b/linux/drm.h
index ce07bb61..5b53df8c 100644
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -71,7 +71,7 @@ typedef struct drm_clip_rect {
unsigned short y2;
} drm_clip_rect_t;
-/* Seperate include files for the i810/mga specific structures */
+/* Seperate include files for the i810/mga/r128 specific structures */
#include "mga_drm.h"
#include "i810_drm.h"
#include "r128_drm.h"