diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
| commit | a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82 (patch) | |
| tree | 71acee51f11c433be4c4a51635ce1ea4302ca4b6 /sys/modules | |
| parent | 54cf5d1b6607c1e6f2cbf32784c33720517bce49 (diff) | |
| parent | 3bc7f4d78d27696df85e118c07aa5a2630188922 (diff) | |
| download | FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.zip FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile.inc | 1 | ||||
| -rw-r--r-- | sys/modules/drm2/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/drm2/radeonkmsfw/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/netgraph/Makefile | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc index 9dc38af..b20b99b 100644 --- a/sys/modules/Makefile.inc +++ b/sys/modules/Makefile.inc @@ -4,3 +4,4 @@ CFLAGS+= -DPC98 .endif +SUBDIR_PARALLEL= yes diff --git a/sys/modules/drm2/Makefile b/sys/modules/drm2/Makefile index 3671c1a..e4e19fb 100644 --- a/sys/modules/drm2/Makefile +++ b/sys/modules/drm2/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -SUBDIR_PARALLEL= - .if ${MACHINE_CPUARCH} == "amd64" _i915kms= i915kms _radeonkms= radeonkms diff --git a/sys/modules/drm2/radeonkmsfw/Makefile b/sys/modules/drm2/radeonkmsfw/Makefile index f885da9..167743c 100644 --- a/sys/modules/drm2/radeonkmsfw/Makefile +++ b/sys/modules/drm2/radeonkmsfw/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -SUBDIR_PARALLEL= - SUBDIR= \ ARUBA_me \ ARUBA_pfp \ diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index 03873e4..dc44ac7 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -62,6 +62,4 @@ _bluetooth= bluetooth _mppc= mppc .endif -SUBDIR_PARALLEL= - .include <bsd.subdir.mk> |
