diff options
| author | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
| commit | 44aa4d6297874022a4f5a49ea24f2d052584d3dc (patch) | |
| tree | a3b8646dd51527d2fb246dbc11a124f4fd60968a /linux-core/Makefile.kernel | |
| parent | 14945ada16218e9f918c24e0d702979fae9b07f6 (diff) | |
First pass merge of XFree86 4.2.0 import.
Diffstat (limited to 'linux-core/Makefile.kernel')
| -rw-r--r-- | linux-core/Makefile.kernel | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index e2630989..1060d4cb 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -3,13 +3,14 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. O_TARGET := drm.o -list-multi := gamma.o tdfx.o r128.o mga.o i810.o ffb.o radeon.o +list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o gamma-objs := gamma_drv.o gamma_dma.o tdfx-objs := tdfx_drv.o r128-objs := r128_drv.o r128_cce.o r128_state.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o i810-objs := i810_drv.o i810_dma.o +i830-objs := i830_drv.o i830_dma.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o ffb-objs := ffb_drv.o ffb_context.o @@ -19,6 +20,7 @@ obj-$(CONFIG_DRM_R128) += r128.o obj-$(CONFIG_DRM_RADEON)+= radeon.o obj-$(CONFIG_DRM_MGA) += mga.o obj-$(CONFIG_DRM_I810) += i810.o +obj-$(CONFIG_DRM_I830) += i830.o obj-$(CONFIG_DRM_FFB) += ffb.o include $(TOPDIR)/Rules.make @@ -35,6 +37,9 @@ mga.o: $(mga-objs) $(lib) i810.o: $(i810-objs) $(lib) $(LD) -r -o $@ $(i810-objs) $(lib) +i830.o: $(i830-objs) $(lib) + $(LD) -r -o $@ $(i830-objs) $(lib) + r128.o: $(r128-objs) $(lib) $(LD) -r -o $@ $(r128-objs) $(lib) |