Module Name: src
Committed By: martin
Date: Fri Jan 23 09:01:45 UTC 2015
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: INSTALL
src/sys/arch/i386/conf [netbsd-7]: INSTALL
Log Message:
Remove "no i915drm*" now that the declaration is gone from GENERIC.
Requested by snj in ticket #438.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/amd64/conf/INSTALL
cvs rdiff -u -r1.330 -r1.330.30.1 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/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.89 src/sys/arch/amd64/conf/INSTALL:1.89.8.1
--- src/sys/arch/amd64/conf/INSTALL:1.89 Thu Jun 6 07:11:18 2013
+++ src/sys/arch/amd64/conf/INSTALL Fri Jan 23 09:01:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.89 2013/06/06 07:11:18 msaitoh Exp $
+# $NetBSD: INSTALL,v 1.89.8.1 2015/01/23 09:01:45 martin Exp $
#
# INSTALL - Installation kernel.
#
@@ -8,7 +8,7 @@
include "arch/amd64/conf/GENERIC"
options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.89 $"
+#ident "INSTALL-$Revision: 1.89.8.1 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -17,7 +17,6 @@ options MEMORY_DISK_ROOT_SIZE=10000 # s
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# DRI 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
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.330 src/sys/arch/i386/conf/INSTALL:1.330.30.1
--- src/sys/arch/i386/conf/INSTALL:1.330 Sat May 28 13:01:50 2011
+++ src/sys/arch/i386/conf/INSTALL Fri Jan 23 09:01:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.330 2011/05/28 13:01:50 ryo Exp $
+# $NetBSD: INSTALL,v 1.330.30.1 2015/01/23 09:01:44 martin Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.330 $"
+#ident "INSTALL-$Revision: 1.330.30.1 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,7 +16,6 @@ options MEMORY_DISK_ROOT_SIZE=10000 # s
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# DRI 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
