diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-06-28 20:59:09 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-06-28 21:14:45 +0200 |
| commit | a01e0afd9fc0d647081c6903baa1a7ba505c4b05 (patch) | |
| tree | 7e04eb2b4e87137455920f6131b064dc87056e14 /src/gallium/drivers/galahad/Makefile | |
| parent | 250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7 (diff) | |
| parent | 9ca563a9a8573bf79821abc75ccf0fdade19c8a9 (diff) | |
Merge branch 'gallium-drm-driver-drescriptor'
Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
Diffstat (limited to 'src/gallium/drivers/galahad/Makefile')
| -rw-r--r-- | src/gallium/drivers/galahad/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/galahad/Makefile b/src/gallium/drivers/galahad/Makefile index 67d08745662..e9c4f7e28c8 100644 --- a/src/gallium/drivers/galahad/Makefile +++ b/src/gallium/drivers/galahad/Makefile @@ -6,7 +6,6 @@ LIBNAME = galahad C_SOURCES = \ glhd_objects.c \ glhd_context.c \ - glhd_screen.c \ - glhd_drm.c + glhd_screen.c include ../../Makefile.template |