summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2011-07-08 15:09:33 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2011-07-08 15:09:33 +0000
commitbc5420a8a41f36b8e958a0e7b7433279fd56450f (patch)
tree1697b8b0df4b7f845a2d42ce9b0169178cbb04cc /sys
parent73b30371b23e992e8de56df7ccc859722244aaf5 (diff)
do 1.174 correctly and remove (commented out) option PORTAL
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index fc9e1ce38a9..584995ed105 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.177 2011/07/04 20:43:46 thib Exp $
+# $OpenBSD: GENERIC,v 1.178 2011/07/08 15:09:32 jsg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -46,7 +46,6 @@ option CD9660 # ISO 9660 + Rock Ridge file system
option UDF # UDF (DVD) file system
option MSDOSFS # MS-DOS file system
option FIFO # FIFOs; RECOMMENDED
-#option PORTAL # dynamically created filesystem objects
option SOCKET_SPLICE # Socket Splicing for TCP
option TCP_SACK # Selective Acknowledgements for TCP