diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-30 11:22:48 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-30 11:25:34 -0700 |
| commit | 33c8e03787308c2b86a4f724ba7ce4dc43918b6a (patch) | |
| tree | 5541a392d477ac5dd9c2e4a7c9b4d59d1c9b9c8d /linux-core/drm_objects.h | |
| parent | 8fc72aef70cdec71e3dbce548046974aecc15325 (diff) | |
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
This reverts commit 3ad8db2071d30c198403e605f2726fc5c3e46bfd.
We ended up not needing that namespace, and I'd rather not have the churn
for producing diffs.
Diffstat (limited to 'linux-core/drm_objects.h')
| -rw-r--r-- | linux-core/drm_objects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index 6ec09ef8..6a900612 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -418,7 +418,7 @@ extern int drm_ttm_destroy(struct drm_ttm *ttm); */ struct drm_bo_mem_reg { - struct drm_memrange_node *mm_node; + struct drm_mm_node *mm_node; unsigned long size; unsigned long num_pages; uint32_t page_alignment; @@ -499,7 +499,7 @@ struct drm_buffer_object { unsigned long num_pages; /* For pinned buffers */ - struct drm_memrange_node *pinned_node; + struct drm_mm_node *pinned_node; uint32_t pinned_mem_type; struct list_head pinned_lru; @@ -534,7 +534,7 @@ struct drm_mem_type_manager { int has_type; int use_type; int kern_init_type; - struct drm_memrange manager; + struct drm_mm manager; struct list_head lru; struct list_head pinned; uint32_t flags; |