Merged via-1-2-0: Altered Makefiles in drm/linux

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 68e3504..93c0198 100644 (file)
--- 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
 

diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index 68e3504..93c0198 100644 (file)
--- a/linux/Makefile.kernel
+++ b/linux/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
 

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 734beca..9634bc3 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -44,7 +44,7 @@ endif
 MACHINE := $(shell uname -m)
 
 # Modules for all architectures
-MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o savage.o
+MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o
 
 # Modules only for ix86 architectures
 ifneq (,$(findstring 86,$(MACHINE)))
@@ -85,9 +85,13 @@ SISHEADERS=     sis.h sis_drv.h sis_drm.h $(DRMHEADERS)
 SISSHARED=      sis.h sis_drv.h sis_drm.h sis_ds.c sis_ds.h sis_mm.c
 SAVAGEHEADERS=  savage.h savage_drv.h savage_drm.h $(DRMHEADERS) \
                 $(DRMTEMPLATES)
+VIAHEADERS     = via_drm.h via_drv.h via.h via_mm.h via_ds.h \
+               $(DRMHEADERS) $(DRMTEMPLATES)
+VIASHARED      = via_drm.h via_drv.h via.h via_mm.h via_ds.h via_drv.c \
+               via_ds.c via_irq.c via_map.c via_mm.c
 
 SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
-       $(SISSHARED) $(TDFXSHARED)
+       $(SISSHARED) $(TDFXSHARED) $(VIASHARED)
 
 PROGS = dristat drmstat
 
@@ -317,6 +321,8 @@ CONFIG_DRM_I830 := n
 CONFIG_DRM_SIS := n
 CONFIG_DRM_FFB := n
 CONFIG_DRM_SAVAGE := n
+CONFIG_DRM_VIA := n
+
 
 # Enable module builds for the modules requested/supported.
 
@@ -335,6 +341,10 @@ endif
 ifneq (,$(findstring sis,$(DRM_MODULES)))
 CONFIG_DRM_SIS := m
 endif
+ifneq (,$(findstring via,$(DRM_MODULES)))
+CONFIG_DRM_VIA := m
+endif
+
 
 # These require AGP support
 
@@ -366,6 +376,8 @@ $(radeon-objs):     $(RADEONHEADERS)
 $(sis-objs):   $(SISHEADERS)
 $(ffb-objs):   $(FFBHEADERS)
 $(savage-objs): $(SAVAGEHEADERS)
+$(via-objs):   $(VIAHEADERS)
+
 
 endif