From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm In directory usw-pr-cvs1:/tmp/cvs-serv18863/drivers/char/drm Modified Files: Tag: linux-sh-dc-2_4-branch Config.in Makefile Log Message: Linux-SH 2.4.20-pre11 Index: Config.in =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm/Config.in,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -d -r1.3 -r1.3.4.1 --- Config.in 17 Dec 2001 04:43:48 -0000 1.3 +++ Config.in 26 Oct 2002 14:14:01 -0000 1.3.4.1 @@ -5,13 +5,13 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. # -bool 'Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)' CONFIG_DRM -if [ "$CONFIG_DRM" != "n" ]; then - tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX - tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA - tristate ' ATI Rage 128' CONFIG_DRM_R128 - dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP - dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP - dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP - dep_tristate ' NEC PowerVR2' CONFIG_DRM_PVR2 $CONFIG_SH_DREAMCAST -fi +tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX +#tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA +tristate ' ATI Rage 128' CONFIG_DRM_R128 +dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP +dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP +dep_mbool ' Enabled XFree 4.1 ioctl interface by default' CONFIG_DRM_I810_XFREE_41 $CONFIG_DRM_I810 +dep_tristate ' Intel 830M' CONFIG_DRM_I830 $CONFIG_AGP +dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP +dep_tristate ' SiS' CONFIG_DRM_SIS $CONFIG_AGP +dep_tristate ' NEC PowerVR2' CONFIG_DRM_PVR2 $CONFIG_SH_DREAMCAST Index: Makefile =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm/Makefile,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- Makefile 15 Sep 2001 02:59:50 -0000 1.2 +++ Makefile 26 Oct 2002 14:14:01 -0000 1.2.4.1 @@ -3,15 +3,18 @@ # 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 radeon.o ffb.o pvr2.o +list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o radeon.o ffb.o sis.o pvr2.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 +sis-objs := sis_drv.o sis_ds.o sis_mm.o pvr2-objs := pvr2_drv.o obj-$(CONFIG_DRM_GAMMA) += gamma.o @@ -20,7 +23,9 @@ 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 +obj-$(CONFIG_DRM_SIS) += sis.o obj-$(CONFIG_DRM_PVR2) += pvr2.o include $(TOPDIR)/Rules.make @@ -37,6 +42,9 @@ 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) @@ -45,6 +53,9 @@ ffb.o: $(ffb-objs) $(lib) $(LD) -r -o $@ $(ffb-objs) $(lib) + +sis.o: $(sis-objs) $(lib) + $(LD) -r -o $@ $(sis-objs) $(lib) pvr2.o: $(pvr2-objs) $(lib) $(LD) -r -o $@ $(pvr2-objs) $(lib) |