summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2012-04-29 16:14:09 +0000
committermarius <marius@FreeBSD.org>2012-04-29 16:14:09 +0000
commitb68639fc3d2aaf4fe796ef4d48ffeb51d10b8046 (patch)
tree62745f6ae7a3b9192c425219991b26b616e08c3d
parentf50e72646456649e166c0c384943782c5e295eb9 (diff)
downloadFreeBSD-src-b68639fc3d2aaf4fe796ef4d48ffeb51d10b8046.zip
FreeBSD-src-b68639fc3d2aaf4fe796ef4d48ffeb51d10b8046.tar.gz
Drag in subr_acl_nfs4.c for ZFS automatically, otherwise it's
unintuitive that "options zfs" requires "options ufs_acl".
-rw-r--r--sys/conf/files2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index ecabaa8..c533869 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2553,7 +2553,7 @@ kern/sched_ule.c optional sched_ule
kern/serdev_if.m standard
kern/stack_protector.c standard \
compile-with "${NORMAL_C:N-fstack-protector*}"
-kern/subr_acl_nfs4.c optional ufs_acl
+kern/subr_acl_nfs4.c optional ufs_acl | zfs
kern/subr_acl_posix1e.c optional ufs_acl
kern/subr_autoconf.c standard
kern/subr_blist.c standard
OpenPOWER on IntegriCloud