Index: extras/drm/linux-core/Makefile
===================================================================
RCS file: /cvs/xorg/xc/extras/drm/linux-core/Makefile,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile
*** extras/drm/linux-core/Makefile	15 Jun 2005 18:31:53 -0000	1.1.1.1
--- extras/drm/linux-core/Makefile	6 Sep 2005 05:17:11 -0000
***************
*** 50,56 ****
  MACHINE := $(shell uname -m)
  
  # Modules for all architectures
! MODULE_LIST := drm.0 tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o mach64.o
  
  # Modules only for ix86 architectures
  ifneq (,$(findstring 86,$(MACHINE)))
--- 50,56 ----
  MACHINE := $(shell uname -m)
  
  # Modules for all architectures
! MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o mach64.o
  
  # Modules only for ix86 architectures
  ifneq (,$(findstring 86,$(MACHINE)))
Index: extras/drm/shared-core/mga_dma.c
===================================================================
RCS file: /cvs/xorg/xc/extras/drm/shared-core/mga_dma.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 mga_dma.c
*** extras/drm/shared-core/mga_dma.c	15 Jun 2005 18:32:02 -0000	1.1.1.1
--- extras/drm/shared-core/mga_dma.c	6 Sep 2005 05:17:11 -0000
***************
*** 475,481 ****
--- 475,485 ----
  
  	/* Allocate and bind AGP memory. */
  	dev_priv->agp_pages = agp_size / PAGE_SIZE;
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
  	dev_priv->agp_mem = drm_alloc_agp( dev_priv->agp_pages, 0 );
+ #else
+ 	dev_priv->agp_mem = drm_alloc_agp( dev->agp->bridge, dev_priv->agp_pages, 0 );
+ #endif
  	if (dev_priv->agp_mem == NULL) {
  		dev_priv->agp_pages = 0;
  		DRM_ERROR("Unable to allocate %uMB AGP memory\n",
Index: programs/Xserver/hw/xfree86/drivers/via/via_id.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_id.c,v
retrieving revision 1.7
diff -c -r1.7 via_id.c
*** programs/Xserver/hw/xfree86/drivers/via/via_id.c	11 Jul 2005 02:30:07 -0000	1.7
--- programs/Xserver/hw/xfree86/drivers/via/via_id.c	6 Sep 2005 05:17:19 -0000
***************
*** 67,72 ****
--- 67,74 ----
   * ECS k8m800-m2
   * Epox EP-8KMM5I (km400a)
   * MSI K8M Neo-V
+  * MSI K8M K8MM-V
+  * MSI K8M K8MM-ILSR
   * PcChips M861G
   * Soltek SL-B9C-FGR (Qbic EQ3802-300P)
   * Soltek SL-K8M800I-R
***************
*** 125,130 ****
--- 127,133 ----
      {"Sharp Actius AL27",                     VIA_K8M800,  0x13BD, 0x1044, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
      {"Giga-byte GA-K8VM800M",                 VIA_K8M800,  0x1458, 0xD000, VIA_DEVICE_CRT},
      {"MSI K8M Neo-V",                         VIA_K8M800,  0x1462, 0x0320, VIA_DEVICE_CRT},
+     {"MSI K8MM-V",                            VIA_K8M800,  0x1462, 0x7142, VIA_DEVICE_CRT},
      {"MSI K8MM-ILSR",                         VIA_K8M800,  0x1462, 0x7410, VIA_DEVICE_CRT},
      {"Abit KV-80",                            VIA_K8M800,  0x147B, 0x1419, VIA_DEVICE_CRT},
      {"Averatec 327x",                         VIA_K8M800,  0x14FF, 0x0315, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
