summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-07-21 07:13:07 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-07-21 07:13:07 +0000
commitbb2ae53976ec80f56563c922b58d3d23e06e535e (patch)
tree519f9904ed3ac16fd20de6d0244893a37c82e256 /sys/conf
parent6e705ffd52db3149fd132e8b71aae735b57f4c30 (diff)
disable vscsi until we actually have something that uses it (like iscsid),
and until matthew@ is happy with it. suggested by deraadt@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 71f072740ee..bde876c63cb 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.160 2010/07/01 20:24:04 thib Exp $
+# $OpenBSD: GENERIC,v 1.161 2010/07/21 07:13:06 dlg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -74,8 +74,8 @@ option MROUTING # Multicast router
softraid0 at root # Software RAID
scsibus* at softraid?
-vscsi0 at root # Userland backed Virtual SCSI
-scsibus* at vscsi?
+#vscsi0 at root # Userland backed Virtual SCSI
+#scsibus* at vscsi?
pseudo-device pf # packet filter
pseudo-device pflog # pf log if