From ebc0ffba79cc4bd564a8bd97327f24a1d15b3d1a Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 8 Mar 2010 16:36:24 +0100 Subject: XvMC: merge *_hwmc.c into i830_hwmc.c After unifying i915 and i965, not much will be left of these files. Therefore merge them to make the following changes easier. This creates some warnings about some redefined macros, but when this is all cleaned up they'll all be gone. Signed-off-by: Daniel Vetter --- src/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b4bafbd4..3ea7fec4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,9 +44,7 @@ INTEL_DRI_SRCS = \ INTEL_XVMC_SRCS = \ i830_hwmc.h \ i830_hwmc.c \ - i915_hwmc.c \ i915_hwmc.h \ - i965_hwmc.c \ i965_hwmc.h intel_drv_la_SOURCES = \ -- cgit v1.2.3