diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-08 16:36:24 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-08 11:22:16 +0200 |
| commit | ebc0ffba79cc4bd564a8bd97327f24a1d15b3d1a (patch) | |
| tree | 47b228d3a76fb5ecd0f417a203dc372b58705306 /src/Makefile.am | |
| parent | 8199f8f191f8385ef3a228e0ec014a8bbd44002b (diff) | |
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 <daniel.vetter@ffwll.ch>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
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 = \ |