projects
/
profile
/
ivi
/
libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
[profile/ivi/libdrm.git]
/
linux-core
/
Makefile.kernel
diff --git
a/linux-core/Makefile.kernel
b/linux-core/Makefile.kernel
index
321eb80
..
c898206
100644
(file)
--- 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 \