summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/Makefile
diff options
context:
space:
mode:
authorThomas Hellstrom2006-08-07 14:03:22 +0200
committerDave Airlie2006-09-21 21:32:31 +0200
commitce65a44de07f73ceda1749812b75086b7add408d (patch)
tree9656065df50d0125b834e100aa2f5038c8d207e7 /drivers/char/drm/Makefile
parentdrm: add simple DRM memory manager, and hash table (diff)
downloadkernel-qcow2-linux-ce65a44de07f73ceda1749812b75086b7add408d.tar.gz
kernel-qcow2-linux-ce65a44de07f73ceda1749812b75086b7add408d.tar.xz
kernel-qcow2-linux-ce65a44de07f73ceda1749812b75086b7add408d.zip
drm: add drm simple memory manager support for SiS and VIA drivers
This add support to the SiS and VIA drivers for the simple memory manager. This fixes a lot of problems with the current simple code these drivers used, including locking and SMP issues. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/Makefile')
-rw-r--r--drivers/char/drm/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index 5eb79f2d5587..3ad0f648c6b2 100644
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
@@ -16,9 +16,9 @@ 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
radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
ffb-objs := ffb_drv.o ffb_context.o
-sis-objs := sis_drv.o sis_ds.o sis_mm.o
+sis-objs := sis_drv.o sis_mm.o
savage-objs := savage_drv.o savage_bci.o savage_state.o
-via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
+via-objs := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
ifeq ($(CONFIG_COMPAT),y)
drm-objs += drm_ioc32.o