diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
| commit | 05204b9c8d021e019456a8dbd83c012e277c7aaf (patch) | |
| tree | 5639c2821d47e92cc615059cbc12e9c050753230 /linux-core/Makefile.kernel | |
| parent | e544286eae71a6b150af4d86096895c14e42c36e (diff) | |
| parent | 0c95d489abd19efd2ba017e78a4b28cea0854e77 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'linux-core/Makefile.kernel')
| -rw-r--r-- | linux-core/Makefile.kernel | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index be2641c8..5aa589cd 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -22,6 +22,7 @@ i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \ i915_buffer.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nouveau_object.o nouveau_irq.o nouveau_notifier.o \ + nouveau_sgdma.o \ nv04_timer.o \ nv04_mc.o nv40_mc.o nv50_mc.o \ nv04_fb.o nv10_fb.o nv40_fb.o \ |