diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:04:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:04:06 +1000 |
| commit | 4b7ba8697bc519abd4f79057f65a8a8e7107ac37 (patch) | |
| tree | e959028bf89da63e6928259aebe4dae6b2c13a29 /drivers/gpu/drm/vmwgfx/Makefile | |
| parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) | |
| parent | 18e4a4669c5023eb1157f2a3f1bf6ca2b8535572 (diff) | |
Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux into drm-next
Pull request of 2014-07-04
* tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Fix compat shader namespace
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/Makefile')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile index 458cdf6d81e8..ce0ab951f507 100644 --- a/drivers/gpu/drm/vmwgfx/Makefile +++ b/drivers/gpu/drm/vmwgfx/Makefile @@ -6,6 +6,7 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \ vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \ - vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o + vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \ + vmwgfx_cmdbuf_res.o \ obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o |