Full merge from trunk.

6 files changed, 15 insertions, 11 deletions

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 54afeb68..a39b3cc5 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -43,13 +43,14 @@ else
 endif
 
 gamma-objs  := gamma_drv.o    gamma_dma.o
-tdfx-objs   := tdfx_drv.o     tdfx_drm.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_drm.o mga_dma.o mga_state.o mga_warp.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
diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index 54afeb68..a39b3cc5 100644
--- a/linux/Makefile.kernel
+++ b/linux/Makefile.kernel
@@ -43,13 +43,14 @@ else
 endif
 
 gamma-objs  := gamma_drv.o    gamma_dma.o
-tdfx-objs   := tdfx_drv.o     tdfx_drm.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_drm.o mga_dma.o mga_state.o mga_warp.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
diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 9335b184..b5aca0a8 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -47,8 +47,6 @@
 
 # **** End of SMP/MODVERSIONS detection
 
-#MODS=           gamma.o tdfx.o r128.o radeon.o
-#LIBS=           libdrm.a
 MODS=           gamma.o tdfx.o
 LIBS=
 
@@ -137,9 +135,13 @@ ifeq ($(AGP),1)
 MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
 #DRMOBJS += agpsupport.o
 MODS += mga.o r128.o radeon.o
-#ifeq ($(MACHINE),i386)
+ifeq ($(MACHINE),i386)
 MODS += i810.o
-#endif
+endif
+ifeq ($(MACHINE),i686)
+MODS += i810.o
+endif
+
 
 MGAOBJS=	mga_drv.o mga_dma.o mga_state.o mga_warp.o
 MGAHEADERS=	mga.h mga_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
diff --git a/linux/drm.h b/linux/drm.h
index a238f85c..470eb033 100644
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -181,7 +181,7 @@ typedef enum {
 	_DRM_STAT_DMA,		/* DMA */
 	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
 	_DRM_STAT_MISSED	/* Missed DMA opportunity */
-	
+
 				/* Add to the *END* of the list */
 } drm_stat_type_t;
 
diff --git a/shared-core/drm.h b/shared-core/drm.h
index a238f85c..470eb033 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -181,7 +181,7 @@ typedef enum {
 	_DRM_STAT_DMA,		/* DMA */
 	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
 	_DRM_STAT_MISSED	/* Missed DMA opportunity */
-	
+
 				/* Add to the *END* of the list */
 } drm_stat_type_t;
 
diff --git a/shared/drm.h b/shared/drm.h
index a238f85c..470eb033 100644
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -181,7 +181,7 @@ typedef enum {
 	_DRM_STAT_DMA,		/* DMA */
 	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
 	_DRM_STAT_MISSED	/* Missed DMA opportunity */
-	
+
 				/* Add to the *END* of the list */
 } drm_stat_type_t;