diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-08-24 17:52:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-08-24 17:52:40 +1000 |
| commit | 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a (patch) | |
| tree | 832251b8ecfc3282c1748187350ceb0e3a5cdc9f /src/mesa/drivers/dri/i965/Makefile | |
| parent | a35002c1673a1a37ec79b237dda7e8f6b9c9962a (diff) | |
Revert "Merge branch 'drm-gem'"
This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03.
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/Makefile')
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index 8fa205e79f..c561b744d1 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -9,6 +9,7 @@ DRIVER_SOURCES = \ intel_blit.c \ intel_buffer_objects.c \ intel_buffers.c \ + intel_bufmgr_ttm.c \ intel_context.c \ intel_decode.c \ intel_depthstencil.c \ @@ -84,6 +85,7 @@ DRIVER_SOURCES = \ C_SOURCES = \ $(COMMON_SOURCES) \ + $(COMMON_BM_SOURCES) \ $(MINIGLX_SOURCES) \ $(DRIVER_SOURCES) |