summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2007-11-25 16:14:11 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2007-11-25 16:14:11 +0000
commit83ffcdaf38bb4533511a7ca1727d35d0af1172fb (patch)
treeff7ec90f1b35a1be53110e9acd4bef7567f0a705
parentc891391e622c28fb2a2c3112e7cbd1a27da457e3 (diff)
Re-enable softraid. Tested on virtually all platforms by many people.
Thanks! ok deraadt
-rw-r--r--sys/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 8f6764030f5..9dc6a520fda 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.135 2007/11/25 10:18:25 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.136 2007/11/25 16:14:10 marco Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -67,8 +67,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