summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-09 14:33:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-09 14:33:00 +0000
commit136873ca9383ddf28b4811726bedd929e974b157 (patch)
tree9b71eb8556de0fc1b6edc61d5947a007076fa222 /sys/conf/GENERIC
parent91614215ff85e9165f2e201ca0a0b3bba8c47d40 (diff)
change a maze of altq options into just "altq" for the base+red+cbq, and
then altq_* for each of the other * experimental options. and.. enable it by default in GENERIC.
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index f6e25056ce8..dfae1f2577e 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.83 2001/08/08 15:15:28 jjbg Exp $
+# $OpenBSD: GENERIC,v 1.84 2001/08/09 14:32:59 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -60,6 +60,7 @@ option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP
+option ALTQ # ALTQ base
option INET6 # IPv6 (needs INET)
option PULLDOWN_TEST # use m_pulldown for IPv6 packet parsing
option IPSEC # IPsec