From 89d67d90873d1baff48fbd671d5b3a4cb354ada5 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <unichrome@shipmail.org>
Date: Tue, 23 Mar 2004 21:14:17 +0000
Subject: Merged via-1-2-0: Altered Makefiles in drm/linux

---
 linux-core/Makefile.kernel | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'linux-core')

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 68e3504f..93c0198e 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -17,6 +17,7 @@ radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
 savage-objs := savage_drv.o savage_dma.o
+via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o 
 
 # Kernel version checks
 
@@ -32,7 +33,7 @@ endif
 ifeq ($(BELOW25),y)
 O_TARGET	:= drm.o
 list-multi	:= gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \
-                   savage.o
+                   savage.o via.o
 obj-m		:=
 obj-n		:=
 obj-		:=
@@ -48,6 +49,7 @@ obj-$(CONFIG_DRM_I830)	+= i830.o
 obj-$(CONFIG_DRM_SIS)   += sis.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
 obj-$(CONFIG_DRM_SAVAGE)+= savage.o
+obj-$(CONFIG_DRM_VIA)   += via.o
 
 ifeq ($(BELOW2552),y)
 include $(TOPDIR)/Rules.make
@@ -83,5 +85,9 @@ ffb.o: $(ffb-objs) $(lib)
 
 savage.o: $(savage-objs) $(lib)
 	$(LD) -r -o $@ $(savage-objs) $(lib)
+
+via.o: $(via-objs) $(lib)
+	$(LD) -r -o $@ $(via-objs) $(lib)
+
 endif
 
-- 
cgit v1.2.3