Module Name: src
Committed By: martin
Date: Tue Jan 20 20:40:51 UTC 2015
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: GENERIC
src/sys/arch/i386/conf [netbsd-7]: GENERIC
Log Message:
Change the following, requested by snj in ticket #438:
sys/arch/i386/conf/GENERIC patch
sys/arch/amd64/conf/GENERIC patch
Remove the i915drm driver since the version we use doesn't support UMS
anymore, so X will fail to start. Without it, at least the vesa driver
will work.
To generate a diff of this commit:
cvs rdiff -u -r1.392.2.4 -r1.392.2.5 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1107.2.3 -r1.1107.2.4 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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.4 src/sys/arch/amd64/conf/GENERIC:1.392.2.5
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.4 Tue Nov 18 19:05:28 2014
+++ src/sys/arch/amd64/conf/GENERIC Tue Jan 20 20:40:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.4 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.5 2015/01/20 20:40:50 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.392.2.4 $"
+#ident "GENERIC-$Revision: 1.392.2.5 $"
maxusers 64 # estimated number of users
@@ -384,7 +384,7 @@ pcppi0 at isa?
sysbeep0 at pcppi?
# DRI driver
-i915drm* at drm? # Intel i915, i945 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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.3 src/sys/arch/i386/conf/GENERIC:1.1107.2.4
--- src/sys/arch/i386/conf/GENERIC:1.1107.2.3 Tue Nov 18 19:05:30 2014
+++ src/sys/arch/i386/conf/GENERIC Tue Jan 20 20:40:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.3 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.4 2015/01/20 20:40:50 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1107.2.3 $"
+#ident "GENERIC-$Revision: 1.1107.2.4 $"
maxusers 64 # estimated number of users
@@ -555,7 +555,7 @@ pcppi0 at isa?
sysbeep0 at pcppi?
# DRI driver
-i915drm* at drm? # Intel i915, i945 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
