diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
| commit | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (patch) | |
| tree | b92c293d743846a23e145bdd6e76a2e7076fae85 /linux-core/Makefile.kernel | |
| parent | 6ac742d95dfd717ae730035da34624682c652b7b (diff) | |
| parent | fdbc34fab03eba8d257e14c6d557ffed5fa32c2d (diff) | |
Merge branch 'master' into crestline
Diffstat (limited to 'linux-core/Makefile.kernel')
| -rw-r--r-- | linux-core/Makefile.kernel | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index b4ac2642..b531a70f 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -22,7 +22,8 @@ i830-objs := i830_drv.o i830_dma.o i830_irq.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 nv40_graph.o + nouveau_object.o nouveau_irq.o nv10_graph.o nv30_graph.o nv40_graph.o \ + nv20_graph.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 |