diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 12:04:08 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 12:04:08 +0200 |
| commit | 1218430e1200a08cd64b6555d3fd1fd0274ad9e5 (patch) | |
| tree | e060fb27b8388a4bd237ca39fc20f1675c5e367c /src/gallium/winsys/i915/drm/Makefile | |
| parent | 63b1525cf0a50e3d31328c3b56355a86056e4c05 (diff) | |
| parent | bf21b7006c63c3dc47045c22d4f372dfe6c7ce67 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
configs/linux-dri
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/tests/python/samples/tri.py
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/tests/unit/SConscript
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
Diffstat (limited to 'src/gallium/winsys/i915/drm/Makefile')
| -rw-r--r-- | src/gallium/winsys/i915/drm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/winsys/i915/drm/Makefile b/src/gallium/winsys/i915/drm/Makefile index a67b9e8a528..1977de1fb09 100644 --- a/src/gallium/winsys/i915/drm/Makefile +++ b/src/gallium/winsys/i915/drm/Makefile @@ -7,7 +7,7 @@ C_SOURCES = \ i915_drm_batchbuffer.c \ i915_drm_buffer.c \ i915_drm_fence.c \ - i915_drm_api.c + i915_drm_winsys.c LIBRARY_INCLUDES = $(shell pkg-config libdrm --cflags-only-I) |