From d14a1071582c9a802f0b37556665b79f38f7eaae Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Wed, 2 Nov 2011 12:01:23 -0400 Subject: Fix gallium dri compile and a merge conflict --- src/gallium/targets/Makefile.dri | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gallium/targets/Makefile.dri') diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri index eb2d66c0931..e828d4fcaae 100644 --- a/src/gallium/targets/Makefile.dri +++ b/src/gallium/targets/Makefile.dri @@ -12,7 +12,6 @@ MESA_MODULES = \ COMMON_GALLIUM_SOURCES = \ $(TOP)/src/mesa/drivers/dri/common/utils.c \ - $(TOP)/src/mesa/drivers/dri/common/vblank.c \ $(TOP)/src/mesa/drivers/dri/common/dri_util.c \ $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c -- cgit v1.2.3