diff options
author | Ian Romanick <idr@us.ibm.com> | 2007-07-12 15:28:17 -0700 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2007-07-12 15:28:17 -0700 |
commit | 5522136b7f01402ae02cbe35180e3d80f850a6b3 (patch) | |
tree | 275da77af4df8b332f17cb503a4b58b608de8620 /linux-core/Makefile.kernel | |
parent | 76ca1e858fb8e1a65ea49c0c62350d7ca91044a2 (diff) | |
parent | 851c950d988e5a47fa6add71427e5ef8d4dcf231 (diff) |
Merge branch 'master' into xgi-0-0-2
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r-- | linux-core/Makefile.kernel | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index d9865f5a..321eb807 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -21,12 +21,14 @@ i810-objs := i810_drv.o i810_dma.o 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_object.o nouveau_irq.o nouveau_notifier.o \ nv04_timer.o \ - nv04_mc.o nv40_mc.o \ + nv04_mc.o nv40_mc.o nv50_mc.o \ nv04_fb.o nv10_fb.o nv40_fb.o \ + nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ - nv40_graph.o + nv40_graph.o nv50_graph.o \ + nv04_instmem.o nv50_instmem.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o sis-objs := sis_drv.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o |