Merged ati-5-0-0

1 files changed, 23 insertions, 15 deletions

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index d25e33d4..9fe0038f 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -7,7 +7,7 @@
 # The real targets are in the module-list
 O_TARGET	:= drm.o
 
-module-list     := gamma.o tdfx.o r128.o ffb.o mga.o i810.o
+module-list     := gamma.o tdfx.o r128.o radeon.o ffb.o mga.o i810.o
 export-objs     := $(patsubst %.o,%_drv.o,$(module-list))
 
 # libs-objs are included in every module so that radical changes to the
@@ -38,23 +38,28 @@ ifeq ($(CONFIG_AGP),y)
  lib-objs  += agpsupport.o
 else
  ifeq ($(CONFIG_AGP),m)
-  lib-objs  += agpsupport.o
+  lib-objs += agpsupport.o
  endif
 endif
 
-gamma-objs := gamma_drv.o gamma_dma.o
-tdfx-objs  := tdfx_drv.o                tdfx_context.o
-r128-objs  := r128_drv.o  r128_cce.o    r128_context.o r128_bufs.o r128_state.o
-ffb-objs   := ffb_drv.o                 ffb_context.o
-mga-objs   := mga_drv.o   mga_dma.o     mga_context.o  mga_bufs.o  mga_state.o
-i810-objs  := i810_drv.o  i810_dma.o    i810_context.o i810_bufs.o
-
-obj-$(CONFIG_DRM_GAMMA) += gamma.o
-obj-$(CONFIG_DRM_TDFX)  += tdfx.o
-obj-$(CONFIG_DRM_R128)  += r128.o
-obj-$(CONFIG_DRM_FFB)   += ffb.o
-obj-$(CONFIG_DRM_MGA)   += mga.o
-obj-$(CONFIG_DRM_I810)  += i810.o
+gamma-objs  := gamma_drv.o    gamma_dma.o
+tdfx-objs   := tdfx_drv.o                   tdfx_context.o
+r128-objs   := r128_drv.o     r128_cce.o    r128_context.o   r128_bufs.o \
+               r128_state.o
+radeon-objs := radeon_drv.o   radeon_cp.o   radeon_context.o radeon_bufs.o \
+               radeon_state.o
+ffb-objs    := ffb_drv.o                    ffb_context.o
+mga-objs    := mga_drv.o      mga_dma.o     mga_context.o    mga_bufs.o \
+               mga_state.o
+i810-objs   := i810_drv.o     i810_dma.o    i810_context.o   i810_bufs.o
+
+obj-$(CONFIG_DRM_GAMMA)  += gamma.o
+obj-$(CONFIG_DRM_TDFX)   += tdfx.o
+obj-$(CONFIG_DRM_R128)   += r128.o
+obj-$(CONFIG_DRM_RADEON) += radeon.o
+obj-$(CONFIG_DRM_FFB)    += ffb.o
+obj-$(CONFIG_DRM_MGA)    += mga.o
+obj-$(CONFIG_DRM_I810)   += i810.o
 
 
 # When linking into the kernel, link the library just once. 
@@ -96,5 +101,8 @@ i810.o: $(i810-objs) $(lib)
 r128.o: $(r128-objs) $(lib)
 	$(LD) -r -o $@ $(r128-objs) $(lib)
 
+radeon.o: $(radeon-objs) $(lib)
+	$(LD) -r -o $@ $(radeon-objs) $(lib)
+
 ffb.o: $(ffb-objs) $(lib)
 	$(LD) -r -o $@ $(ffb-objs) $(lib)