Module Name: src
Committed By: christos
Date: Sun Jan 10 03:19:36 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
PR/50636: Ryo ONODERA: Add scsibus to vioscsi
To generate a diff of this commit:
cvs rdiff -u -r1.419 -r1.420 src/sys/arch/amd64/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.419 src/sys/arch/amd64/conf/GENERIC:1.420
--- src/sys/arch/amd64/conf/GENERIC:1.419 Tue Jan 5 06:33:18 2016
+++ src/sys/arch/amd64/conf/GENERIC Sat Jan 9 22:19:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.419 2016/01/05 11:33:18 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.420 2016/01/10 03:19:36 christos 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.419 $"
+#ident "GENERIC-$Revision: 1.420 $"
maxusers 64 # estimated number of users
@@ -954,6 +954,7 @@ axen* at uhub? port ? # ASIX AX88178a/A
cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+#mos* at uhub? port ? # Moschip MCS7730/MCS7830/MCS7832 based adapters
udav* at uhub? port ? # Davicom DM9601 based adapters
url* at uhub? port ? # Realtek RTL8150L based adapters
urndis* at uhub? port ? # Microsoft RNDIS specification
@@ -1200,6 +1201,7 @@ ld* at virtio? # Virtio disk device
vioif* at virtio? # Virtio network device
viornd* at virtio? # Virtio entropy device
vioscsi* at virtio? # Virtio SCSI device
+scsibus* at vioscsi?
# Pull in optional local configuration
cinclude "arch/amd64/conf/GENERIC.local"
