diff options
author | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
commit | f84676185368e36c6bc0eeab87ab73ed39042648 (patch) | |
tree | 7d97885644c7b6a09c244de11af94409da665e62 /drivers/gpu/drm/ttm/Makefile | |
parent | 22dd50133ab7548adb23e86c302d6e8b75817e8c (diff) | |
parent | 447aeb907e417e0e837b4a4026d5081c88b6e8ca (diff) | |
download | linux-f84676185368e36c6bc0eeab87ab73ed39042648.tar.gz linux-f84676185368e36c6bc0eeab87ab73ed39042648.tar.bz2 linux-f84676185368e36c6bc0eeab87ab73ed39042648.zip |
Merge remote branch 'origin/drm-core-next' into test
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'drivers/gpu/drm/ttm/Makefile')
-rw-r--r-- | drivers/gpu/drm/ttm/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index b0a9de7a57c2..1e138f5bae09 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -3,6 +3,7 @@ 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_bo_util.o ttm_bo_vm.o ttm_module.o ttm_global.o \ + ttm_object.o ttm_lock.o ttm_execbuf_util.o obj-$(CONFIG_DRM_TTM) += ttm.o |