Module Name: src
Committed By: snj
Date: Mon Dec 4 19:47:05 UTC 2017
Modified Files:
src/sys/arch/i386/conf [netbsd-8]: GENERIC
Log Message:
Pull up following revision(s) (requested by martin in ticket #413):
sys/arch/i386/conf/GENERIC: revision 1.1171
PR port-i386/52774: vioscsi missing in i386 kernel
To generate a diff of this commit:
cvs rdiff -u -r1.1156.2.6 -r1.1156.2.7 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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.6 src/sys/arch/i386/conf/GENERIC:1.1156.2.7
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.6 Mon Sep 11 05:13:45 2017
+++ src/sys/arch/i386/conf/GENERIC Mon Dec 4 19:47:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.6 2017/09/11 05:13:45 snj Exp $
+# $NetBSD: GENERIC,v 1.1156.2.7 2017/12/04 19:47:05 snj 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.1156.2.6 $"
+#ident "GENERIC-$Revision: 1.1156.2.7 $"
maxusers 64 # estimated number of users
@@ -1612,10 +1612,12 @@ geodecntr* at geodegcb? # AMD Geode SC
weasel* at pci?
# Virtio devices
-virtio* at pci? dev ? function ? # Virtio PCI device
-viomb* at virtio? # Virtio memory balloon device
-ld* at virtio? # Virtio disk device
-vioif* at virtio? # Virtio network device
+virtio* at pci? dev ? function ? # Virtio PCI device
+viomb* at virtio? # Virtio memory balloon device
+ld* at virtio? # Virtio disk device
+vioif* at virtio? # Virtio network device
+viornd* at virtio? # Virtio entropy device
+vioscsi* at virtio? # Virtio SCSI device
# Pull in optional local configuration
