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

Wed Jul 25 14:36:16 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/c30f3f89e105
changeset: 502:c30f3f89e105
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 25 16:55:08 2012 +0300
description:
Lazy update

diffstat:

 head/sys/modules/Makefile |  18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diffs (87 lines):

diff -r 91e974ab9285 -r c30f3f89e105 head/sys/modules/Makefile

--- a/head/sys/modules/Makefile	Wed Jul 25 16:53:27 2012 +0300
+++ b/head/sys/modules/Makefile	Wed Jul 25 16:55:08 2012 +0300
@@ -1,11 +1,12 @@
-# $FreeBSD: head/sys/modules/Makefile 232937 2012-03-13 20:28:42Z adrian $
+# $FreeBSD: head/sys/modules/Makefile 238026 2012-07-02 20:36:26Z marcel $
 
 .include <bsd.own.mk>
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
-SUBDIR=	${_3dfx} \
+SUBDIR=	\
+	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
 	accf_data \
@@ -87,6 +88,7 @@
 	${_dpms} \
 	${_dpt} \
 	${_drm} \
+	${_drm2} \
 	${_dtrace} \
 	dummynet \
 	${_ed} \
@@ -104,6 +106,7 @@
 	fdc \
 	fdescfs \
 	${_fe} \
+	filemon \
 	firewire \
 	firmware \
 	${_fxp} \
@@ -218,6 +221,8 @@
 	${_mwlfw} \
 	mxge \
 	my \
+	${_nandfs} \
+	${_nandsim} \
 	${_ncp} \
 	${_ncv} \
 	${_ndis} \
@@ -310,6 +315,7 @@
 	${_ti} \
 	tl \
 	tmpfs \
+	${_toecore} \
 	${_tpm} \
 	trm \
 	${_twa} \
@@ -391,6 +397,7 @@
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=	carp
+_toecore=	toecore
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
@@ -406,6 +413,11 @@
 _ipfw=		ipfw
 .endif
 
+.if ${MK_NAND} != "no" || defined(ALL_MODULES)
+_nandfs=	nandfs
+_nandsim=	nandsim
+.endif
+
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=	netgraph
 .endif
@@ -463,6 +475,7 @@
 .endif
 _dpms=		dpms
 _drm=		drm
+_drm2=		drm2
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
 .endif
@@ -633,6 +646,7 @@
 .endif
 _dpms=		dpms
 _drm=		drm
+_drm2=		drm2
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
 .endif
