diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
| commit | ec7fd3d1b477928f9bffde1a72d7f3fdea89e629 (patch) | |
| tree | 3fb8388c6795b08c967a41689c658f2bde4398a8 /src/Makefile.am | |
| parent | d978cd4b453ea588ed2fc2f2cb4ec26856fe00d4 (diff) | |
| parent | baec75a56d91546443a2e04812face4997bc764b (diff) | |
Merge branch '965-xvmc'
Conflicts:
src/common.h
src/i830_hwmc.c
src/i830_video.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 232ac533..3fb30ff3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,9 @@ INTEL_XVMC_SRCS = \ i830_hwmc.h \ i830_hwmc.c \ i915_hwmc.c \ - i915_hwmc.h + i915_hwmc.h \ + i965_hwmc.c \ + i965_hwmc.h intel_drv_la_SOURCES = \ |