Property changes on: sys
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys:r216109

Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile	(revision 219091)
+++ sys/modules/Makefile	(working copy)
@@ -51,6 +51,7 @@
 	${_cardbus} \
 	cas \
 	${_cbb} \
+	cc \
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \

Property changes on: sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/contrib/pf:r216109


Property changes on: sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/contrib/dev/acpica:r216109


Property changes on: sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/cddl/contrib/opensolaris:r216109


Property changes on: sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/amd64/include/xen:r216109

Index: sys/modules/cc/Makefile
===================================================================
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ sys/modules/cc/Makefile	2011-02-28 18:31:27.847529973 +1100
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=
+
+.include <bsd.subdir.mk>