diff options
author | Dave Airlie <airlied@optimus.localdomain> | 2006-12-20 10:30:16 +1100 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-12-20 10:30:16 +1100 |
commit | e5c4a26a29a9af301cb8b0aebbba84e70f995b83 (patch) | |
tree | 3eba66ce42ce7c3d2d9ced2d726b9ca5d553843a /linux-core/Makefile.kernel | |
parent | 3b7508d1bf2c78f19d882beffa6d8b4f58bd19a8 (diff) | |
parent | dc1b68aacbfc8d53d78f7388e0e52da1747a1f71 (diff) |
Merge branch 'nouveau-1'
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r-- | linux-core/Makefile.kernel | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index fba57ddf..4b7c90be 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -20,7 +20,8 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o 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 + i915_buffer.o +nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o nouveau_object.o nouveau_irq.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 @@ -36,6 +37,7 @@ radeon-objs += radeon_ioc32.o mga-objs += mga_ioc32.o r128-objs += r128_ioc32.o i915-objs += i915_ioc32.o +nouveau-objs += nouveau_ioc32.o endif obj-m += drm.o @@ -52,3 +54,4 @@ obj-$(CONFIG_DRM_SAVAGE)+= savage.o obj-$(CONFIG_DRM_VIA) += via.o obj-$(CONFIG_DRM_MACH64)+= mach64.o obj-$(CONFIG_DRM_NV) += nv.o +obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o |