diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:12:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:12:28 +1000 |
| commit | c2b41276da65481d36311a13d69020d150861c43 (patch) | |
| tree | 5a67f674b77cfdc47bd386f114fbf5a6bff740c6 /drivers/gpu/drm/ttm/Makefile | |
| parent | 97921a5b03d40681b3aed620a5e719710336c6df (diff) | |
| parent | 2125b8a44d771351fc44719ed291be70b73672ad (diff) | |
| download | op-kernel-dev-c2b41276da65481d36311a13d69020d150861c43.zip op-kernel-dev-c2b41276da65481d36311a13d69020d150861c43.tar.gz | |
Merge branch 'drm-ttm-pool' into drm-core-next
* drm-ttm-pool:
drm/ttm: using kmalloc/kfree requires including slab.h
drm/ttm: include linux/seq_file.h for seq_printf
drm/ttm: Add sysfs interface to control pool allocator.
drm/ttm: Use set_pages_array_wc instead of set_memory_wc.
arch/x86: Add array variants for setting memory to wc caching.
drm/nouveau: Add ttm page pool debugfs file.
drm/radeon/kms: Add ttm page pool debugfs file.
drm/ttm: Add debugfs output entry to pool allocator.
drm/ttm: add pool wc/uc page allocator V3
Diffstat (limited to 'drivers/gpu/drm/ttm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/ttm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index 1e138f5..4256e20 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -4,6 +4,6 @@ ccflags-y := -Iinclude/drm ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o ttm_global.o \ - ttm_object.o ttm_lock.o ttm_execbuf_util.o + ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o obj-$(CONFIG_DRM_TTM) += ttm.o |
