summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2004-01-18 21:46:55 +0000
committerBob Beck <beck@cvs.openbsd.org>2004-01-18 21:46:55 +0000
commit9b20fe9407cbb400733ce3ac3f18e8bd5315c8b1 (patch)
treeab583e9c77891f56ae502b73ebc73e541c5f3324 /sys/conf
parent73e6550d6871245c762c9afe087b8c055cc1454a (diff)
clean out #ifdef horror show in xfs_dev-bsd.c and enable XFS in GENERIC.
ok deraadt@, todd@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 8750a7324f1..2f23f129325 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.98 2004/01/07 20:54:35 tedu Exp $
+# $OpenBSD: GENERIC,v 1.99 2004/01/18 21:46:53 beck Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -36,7 +36,7 @@ option UFS_DIRHASH # hash large directories
option QUOTA # UFS quotas
option EXT2FS # Second Extended Filesystem
option MFS # memory file system
-#option XFS # xfs filesystem
+option XFS # xfs filesystem
option TCP_SACK # Selective Acknowledgements for TCP
option TCP_ECN # Explicit Congestion Notification for TCP