diff options
| author | Eric Anholt <eric@anholt.net> | 2006-08-09 14:19:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-08-09 14:19:06 -0700 |
| commit | 24e59a0daa20b7c3e5028c9ca7972052801d02a1 (patch) | |
| tree | 05c71510bbb570aabb6373690a8fd796611aa1fe /src/Makefile.am | |
| parent | bb6080735efc40e103e92b65d0c2f1f729156632 (diff) | |
| parent | 32f1199937e92b9100aba52cbbb97157014e3182 (diff) | |
Merge branch 'textured-video', bringing in fixed-up i915 textured video.
Conflicts:
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 bea7b727..63370ab9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,13 +56,15 @@ i810_drv_la_SOURCES = \ i830_memory.c \ i830_modes.c \ i830_video.c \ + i830_video.h \ i830_rotate.c \ i830_randr.c \ i830_3d.c \ i830_reg.h \ i915_3d.c \ i915_3d.h \ - i915_reg.h + i915_reg.h \ + i915_video.c if DRI i810_drv_la_SOURCES += \ |