Module Name: src
Committed By: mrg
Date: Tue Jun 1 02:40:13 UTC 2010
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
enable the drm drivers; they've been tested for ages and have been
enabled on amd64 for some months now. as requested in PR#42936.
To generate a diff of this commit:
cvs rdiff -u -r1.983 -r1.984 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.983 src/sys/arch/i386/conf/GENERIC:1.984
--- src/sys/arch/i386/conf/GENERIC:1.983 Sat May 22 19:02:08 2010
+++ src/sys/arch/i386/conf/GENERIC Tue Jun 1 02:40:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.983 2010/05/22 19:02:08 plunky Exp $
+# $NetBSD: GENERIC,v 1.984 2010/06/01 02:40:13 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.983 $"
+#ident "GENERIC-$Revision: 1.984 $"
maxusers 64 # estimated number of users
@@ -555,6 +555,16 @@
pcppi0 at isa?
sysbeep0 at pcppi?
+# DRI driver
+i915drm* at vga? # Intel i915, i945 DRM driver
+mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
+mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
+r128drm* at vga? # ATI Rage 128 DRM driver
+radeondrm* at vga? # ATI Radeon DRM driver
+savagedrm* at vga? # S3 Savage DRM driver
+sisdrm* at vga? # SiS DRM driver
+tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
+
# Serial Devices
# PCI serial interfaces
