summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2007-06-02 01:58:18 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2007-06-02 01:58:18 +0000
commit57f840b4068d861aa0a23c23ae281dcd62176f1b (patch)
tree9c61a3649f57aab1f5cca586207cc5c0040b5214 /sys/conf/GENERIC
parent8e80391b08fbf1b0c765d25887e74d911b56b8f7 (diff)
Enable softraid so that people can start testing it.
Note: this is a work in progress! this is under active development and things will change. prompted and ok deraadt
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 9ff0c24cd95..247da8902a4 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.131 2007/05/28 22:26:03 todd Exp $
+# $OpenBSD: GENERIC,v 1.132 2007/06/02 01:58:17 marco Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -69,8 +69,8 @@ option PPP_DEFLATE
option MROUTING # Multicast router
#option PIM # Protocol Independent Multicast
-#softraid0 at root # Software RAID
-#scsibus* at softraid?
+softraid0 at root # Software RAID
+scsibus* at softraid?
pseudo-device pf # packet filter
pseudo-device pflog # pf log if