svn commit: r234792 - head/sys/conf

[Marius Strobl]

Author: marius
Date: Sun Apr 29 16:14:09 2012
New Revision: 234792
URL: http://svn.freebsd.org/changeset/base/234792

Log:
  Drag in subr_acl_nfs4.c for ZFS automatically, otherwise it's
  unintuitive that "options zfs" requires "options ufs_acl".

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sun Apr 29 16:12:31 2012	(r234791)
+++ head/sys/conf/files	Sun Apr 29 16:14:09 2012	(r234792)
@@ -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