Index: stable/10/sys/modules/drm2/Makefile
===================================================================
--- stable/10/sys/modules/drm2/Makefile	(revision 282216)
+++ stable/10/sys/modules/drm2/Makefile	(revision 282217)
@@ -1,36 +1,38 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
+SUBDIR_PARALLEL=
+
 .if ${MACHINE_CPUARCH} == "amd64"
 _i915kms=	i915kms
 _radeonkms=	radeonkms
 . if ${MK_SOURCELESS_UCODE} != "no"
 _radeonkmsfw=	radeonkmsfw
 . endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 . if ${MACHINE} != "pc98"
 _i915kms=	i915kms
 _radeonkms=	radeonkms
 .  if ${MK_SOURCELESS_UCODE} != "no"
 _radeonkmsfw=	radeonkmsfw
 .  endif
 . endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _radeonkms=	radeonkms
 . if ${MK_SOURCELESS_UCODE} != "no"
 _radeonkmsfw=	radeonkmsfw
 . endif
 .endif
 
 SUBDIR = \
 	drm2 \
 	${_i915kms} \
 	${_radeonkms} \
 	${_radeonkmsfw}
 
 .include <bsd.subdir.mk>
Index: stable/10/sys/modules/drm2/radeonkmsfw/Makefile
===================================================================
--- stable/10/sys/modules/drm2/radeonkmsfw/Makefile	(revision 282216)
+++ stable/10/sys/modules/drm2/radeonkmsfw/Makefile	(revision 282217)
@@ -1,85 +1,87 @@
 # $FreeBSD$
 
+SUBDIR_PARALLEL=
+
 SUBDIR=									\
 	ARUBA_me							\
 	ARUBA_pfp							\
 	ARUBA_rlc							\
 	BARTS_mc							\
 	BARTS_me							\
 	BARTS_pfp							\
 	BTC_rlc								\
 	CAICOS_mc							\
 	CAICOS_me							\
 	CAICOS_pfp							\
 	CAYMAN_mc							\
 	CAYMAN_me							\
 	CAYMAN_pfp							\
 	CAYMAN_rlc							\
 	CEDAR_me							\
 	CEDAR_pfp							\
 	CEDAR_rlc							\
 	CYPRESS_me							\
 	CYPRESS_pfp							\
 	CYPRESS_rlc							\
 	JUNIPER_me							\
 	JUNIPER_pfp							\
 	JUNIPER_rlc							\
 	PALM_me								\
 	PALM_pfp							\
 	PITCAIRN_ce							\
 	PITCAIRN_mc							\
 	PITCAIRN_me							\
 	PITCAIRN_pfp							\
 	PITCAIRN_rlc							\
 	R100_cp								\
 	R200_cp								\
 	R300_cp								\
 	R420_cp								\
 	R520_cp								\
 	R600_me								\
 	R600_pfp							\
 	R600_rlc							\
 	R700_rlc							\
 	REDWOOD_me							\
 	REDWOOD_pfp							\
 	REDWOOD_rlc							\
 	RS600_cp							\
 	RS690_cp							\
 	RS780_me							\
 	RS780_pfp							\
 	RV610_me							\
 	RV610_pfp							\
 	RV620_me							\
 	RV620_pfp							\
 	RV630_me							\
 	RV630_pfp							\
 	RV635_me							\
 	RV635_pfp							\
 	RV670_me							\
 	RV670_pfp							\
 	RV710_me							\
 	RV710_pfp							\
 	RV730_me							\
 	RV730_pfp							\
 	RV770_me							\
 	RV770_pfp							\
 	SUMO2_me							\
 	SUMO2_pfp							\
 	SUMO_me								\
 	SUMO_pfp							\
 	SUMO_rlc							\
 	TAHITI_ce							\
 	TAHITI_mc							\
 	TAHITI_me							\
 	TAHITI_pfp							\
 	TAHITI_rlc							\
 	TURKS_mc							\
 	TURKS_me							\
 	TURKS_pfp							\
 	VERDE_ce							\
 	VERDE_mc							\
 	VERDE_me							\
 	VERDE_pfp							\
 	VERDE_rlc
 
 .include <bsd.subdir.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 282216)
+++ stable/10	(revision 282217)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r279600