Module Name: src
Committed By: jmcneill
Date: Fri Feb 11 01:59:57 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC INSTALL
Log Message:
attach drm hw drivers to 'drm' not 'vga'
To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1010 -r1.1011 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.328 -r1.329 src/sys/arch/i386/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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.285 src/sys/arch/i386/conf/ALL:1.286
--- src/sys/arch/i386/conf/ALL:1.285 Mon Jan 17 15:56:03 2011
+++ src/sys/arch/i386/conf/ALL Fri Feb 11 01:59:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.285 2011/01/17 15:56:03 jmcneill Exp $
+# $NetBSD: ALL,v 1.286 2011/02/11 01:59:56 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.285 $"
+#ident "ALL-$Revision: 1.286 $"
maxusers 64 # estimated number of users
@@ -593,15 +593,15 @@
wsdisplay* at xboxfb? console ?
# 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
-viadrm* at vga? # VIA UniChrome 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
+viadrm* at drm? # VIA UniChrome DRM driver
attimer0 at isa?
pcppi0 at isa?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1010 src/sys/arch/i386/conf/GENERIC:1.1011
--- src/sys/arch/i386/conf/GENERIC:1.1010 Mon Feb 7 04:05:49 2011
+++ src/sys/arch/i386/conf/GENERIC Fri Feb 11 01:59:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1010 2011/02/07 04:05:49 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1011 2011/02/11 01:59:57 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1010 $"
+#ident "GENERIC-$Revision: 1.1011 $"
maxusers 64 # estimated number of users
@@ -564,15 +564,15 @@
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
-viadrm* at vga? # VIA 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
+viadrm* at drm? # VIA DRM driver
# Serial Devices
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.328 src/sys/arch/i386/conf/INSTALL:1.329
--- src/sys/arch/i386/conf/INSTALL:1.328 Thu Feb 10 16:49:19 2011
+++ src/sys/arch/i386/conf/INSTALL Fri Feb 11 01:59:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.328 2011/02/10 16:49:19 jym Exp $
+# $NetBSD: INSTALL,v 1.329 2011/02/11 01:59:57 jmcneill Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.328 $"
+#ident "INSTALL-$Revision: 1.329 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,11 +16,12 @@
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# 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
+no viadrm* at drm? # VIA DRM driver
