aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-07 11:43:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-07 11:43:28 -0700
commit78178c7d6e127fff6dba027315fd6914304b05cf (patch)
tree9b207197911feb57753bd9f1a9371851c8ca0991 /include
parent140236b4b1c749c9b795ea3d11558a0eb5a3a080 (diff)
parent023eb571a1d0eae738326042dcffa974257eb8c8 (diff)
downloadlinux-2.6.34-ux500-78178c7d6e127fff6dba027315fd6914304b05cf.tar.gz
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: correctly update connector DPMS status in drm_fb_helper drm/radeon/kms: fix shared ddc handling drm/ttm: Allocate the page pool manager in the heap.
Diffstat (limited to 'include')
-rw-r--r--include/drm/ttm/ttm_page_alloc.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 8bb4de567b2..116821448c3 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -56,10 +56,6 @@ void ttm_put_pages(struct list_head *pages,
enum ttm_caching_state cstate);
/**
* Initialize pool allocator.
- *
- * Pool allocator is internaly reference counted so it can be initialized
- * multiple times but ttm_page_alloc_fini has to be called same number of
- * times.
*/
int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages);
/**