Index: stable/9/sys/modules/netgraph/Makefile =================================================================== --- stable/9/sys/modules/netgraph/Makefile (revision 289976) +++ stable/9/sys/modules/netgraph/Makefile (revision 289977) @@ -1,65 +1,67 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ .include SUBDIR= async \ atm \ atmllc \ ${_bluetooth} \ bpf \ bridge \ car \ cisco \ deflate \ device \ echo \ eiface \ etf \ ether \ ether_echo \ fec \ frame_relay \ gif \ gif_demux \ hole \ hub \ iface \ ip_input \ ipfw \ ksocket \ l2tp \ lmi \ ${_mppc} \ nat \ netflow \ netgraph \ one2many \ patch \ pipe \ ppp \ pppoe \ pptpgre \ pred1 \ rfc1490 \ socket \ source \ split \ sppp \ tag \ tcpmss \ tee \ tty \ UI \ vjc \ vlan .if ${MK_BLUETOOTH} != "no" || defined(ALL_MODULES) _bluetooth= bluetooth .endif .if ${MK_CRYPT} != "no" && exists(${.CURDIR}/../../crypto/rc4/rc4.c) _mppc= mppc .endif +SUBDIR_PARALLEL= + .include Index: stable/9/sys/modules =================================================================== --- stable/9/sys/modules (revision 289976) +++ stable/9/sys/modules (revision 289977) Property changes on: stable/9/sys/modules ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /stable/10/sys/modules:r289976 Index: stable/9/sys =================================================================== --- stable/9/sys (revision 289976) +++ stable/9/sys (revision 289977) Property changes on: stable/9/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /stable/10/sys:r289976 Index: stable/9 =================================================================== --- stable/9 (revision 289976) +++ stable/9 (revision 289977) Property changes on: stable/9 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /head:r288304 Merged /stable/10:r289976