[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Tue Apr 24 17:05:35 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/a3d29eff2697
changeset: 470:a3d29eff2697
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Tue Apr 24 20:05:58 2012 +0300
description:
Restore lost bits

diffstat:

 head/sys/conf/files |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r a5790657ba6f -r a3d29eff2697 head/sys/conf/files

--- a/head/sys/conf/files	Tue Apr 24 20:03:54 2012 +0300
+++ b/head/sys/conf/files	Tue Apr 24 20:05:58 2012 +0300
@@ -2403,6 +2403,7 @@
 geom/part/g_part_bsd.c		optional geom_part_bsd
 geom/part/g_part_ebr.c		optional geom_part_ebr
 geom/part/g_part_gpt.c		optional geom_part_gpt
+geom/part/g_part_ldm.c		optional geom_part_ldm
 geom/part/g_part_mbr.c		optional geom_part_mbr
 geom/part/g_part_pc98.c		optional geom_part_pc98
 geom/part/g_part_vtoc8.c	optional geom_part_vtoc8
@@ -2567,8 +2568,8 @@
 kern/serdev_if.m		standard
 kern/stack_protector.c		standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
-kern/subr_acl_nfs4.c		standard
-kern/subr_acl_posix1e.c		standard
+kern/subr_acl_nfs4.c		optional ufs_acl
+kern/subr_acl_posix1e.c		optional ufs_acl
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_bus.c			standard
