Module Name: src
Committed By: christos
Date: Sun Aug 9 21:32:17 UTC 2009
Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL
Log Message:
put back drm.
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/INSTALL
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.248 src/sys/arch/amd64/conf/GENERIC:1.249
--- src/sys/arch/amd64/conf/GENERIC:1.248 Sun Aug 9 16:27:06 2009
+++ src/sys/arch/amd64/conf/GENERIC Sun Aug 9 17:32:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.248 2009/08/09 20:27:06 christos Exp $
+# $NetBSD: GENERIC,v 1.249 2009/08/09 21:32:16 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.248 $"
+#ident "GENERIC-$Revision: 1.249 $"
maxusers 64 # estimated number of users
@@ -369,6 +369,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
+
# Cryptographic Devices
# PCI cryptographic devices
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.81 src/sys/arch/amd64/conf/INSTALL:1.82
--- src/sys/arch/amd64/conf/INSTALL:1.81 Fri Feb 6 13:50:26 2009
+++ src/sys/arch/amd64/conf/INSTALL Sun Aug 9 17:32:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.81 2009/02/06 18:50:26 jym Exp $
+# $NetBSD: INSTALL,v 1.82 2009/08/09 21:32:16 christos Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/amd64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.81 $"
+#ident "INSTALL-$Revision: 1.82 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,3 +16,12 @@
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
no options MTRR
+# DRI driver
+no i915drm* at vga? # Intel i915, i945 DRM driver
+no mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
+no mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
+no r128drm* at vga? # ATI Rage 128 DRM driver
+no radeondrm* at vga? # ATI Radeon DRM driver
+no savagedrm* at vga? # S3 Savage DRM driver
+no sisdrm* at vga? # SiS DRM driver
+no tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
