Module Name: src
Committed By: jmcneill
Date: Fri Feb 11 02:06:10 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL
Log Message:
attach drm hw drivers to 'drm' not 'vga'
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 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.301 src/sys/arch/amd64/conf/GENERIC:1.302
--- src/sys/arch/amd64/conf/GENERIC:1.301 Sun Feb 6 23:25:16 2011
+++ src/sys/arch/amd64/conf/GENERIC Fri Feb 11 02:06:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.301 2011/02/06 23:25:16 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.301 $"
+#ident "GENERIC-$Revision: 1.302 $"
maxusers 64 # estimated number of users
@@ -374,14 +374,14 @@
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
+i915drm* at drm? # Intel i915, i945 DRM driver
+mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
+mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
+r128drm* at drm? # ATI Rage 128 DRM driver
+radeondrm* at drm? # ATI Radeon DRM driver
+savagedrm* at drm? # S3 Savage DRM driver
+sisdrm* at drm? # SiS DRM driver
+tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
# Cryptographic Devices
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.82 src/sys/arch/amd64/conf/INSTALL:1.83
--- src/sys/arch/amd64/conf/INSTALL:1.82 Sun Aug 9 21:32:16 2009
+++ src/sys/arch/amd64/conf/INSTALL Fri Feb 11 02:06:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.82 2009/08/09 21:32:16 christos Exp $
+# $NetBSD: INSTALL,v 1.83 2011/02/11 02:06:09 jmcneill Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/amd64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.82 $"
+#ident "INSTALL-$Revision: 1.83 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -17,11 +17,11 @@
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
+no i915drm* at drm? # Intel i915, i945 DRM driver
+no mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
+no mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
+no r128drm* at drm? # ATI Rage 128 DRM driver
+no radeondrm* at drm? # ATI Radeon DRM driver
+no savagedrm* at drm? # S3 Savage DRM driver
+no sisdrm* at drm? # SiS DRM driver
+no tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
