svn commit: r230996 - head/sys/conf

[Pawel Jakub Dawidek]

Author: pjd
Date: Sat Feb  4 20:17:07 2012
New Revision: 230996
URL: http://svn.freebsd.org/changeset/base/230996

Log:
  After multiple requests for back out, after multiple promisses from adrian@
  to fix it (without fixing it), after making one of my servers unbootable,
  after now making also my laptop unbootable and after running out of patiance
  back out r229800 until better solution is found.

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sat Feb  4 20:09:06 2012	(r230995)
+++ head/sys/conf/files	Sat Feb  4 20:17:07 2012	(r230996)
@@ -2405,9 +2405,8 @@ kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
 kern/stack_protector.c		standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
-# XXX subr_acl_nfs4.c is also used by ZFS
-kern/subr_acl_nfs4.c		optional ufs_acl
-kern/subr_acl_posix1e.c		optional ufs_acl
+kern/subr_acl_nfs4.c		standard
+kern/subr_acl_posix1e.c		standard
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_bus.c			standard