Index: stable/12/sys/modules/efirt/Makefile
===================================================================
--- stable/12/sys/modules/efirt/Makefile	(revision 350061)
+++ stable/12/sys/modules/efirt/Makefile	(revision 350062)
@@ -1,18 +1,19 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE}
 .PATH: ${SRCTOP}/sys/dev/efidev
 
 KMOD=	efirt
 SRCS=	efirt.c efirt_machdep.c efidev.c
 SRCS+=	efirtc.c
 SRCS+=  device_if.h bus_if.h clock_if.h
 
 .if ${MACHINE_CPUARCH} == "amd64"
+SRCS+=	opt_hwpmc_hooks.h opt_kstack_pages.h
 SRCS+=	efirt_support.S
 efirt_support.o:	efirt_support.S assym.inc
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
Index: stable/12/sys/modules/iflib/Makefile
===================================================================
--- stable/12/sys/modules/iflib/Makefile	(revision 350061)
+++ stable/12/sys/modules/iflib/Makefile	(revision 350062)
@@ -1,13 +1,14 @@
 # $FreeBSD$
 
 .PATH:	${SRCTOP}/sys/net
 
 KMOD=	iflib
 SRCS= \
 	iflib.c \
 	iflib_clone.c \
 	mp_ring.c
 SRCS+=	ifdi_if.c
 SRCS+=	device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h
+SRCS+=	opt_acpi.h opt_inet.h opt_inet6.h opt_sched.h
 
 .include <bsd.kmod.mk>
Index: stable/12/sys/modules/nvdimm/Makefile
===================================================================
--- stable/12/sys/modules/nvdimm/Makefile	(revision 350061)
+++ stable/12/sys/modules/nvdimm/Makefile	(revision 350062)
@@ -1,13 +1,14 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/dev/nvdimm
 
 KMOD=	nvdimm
 SRCS=	nvdimm.c \
 	nvdimm_nfit.c \
 	nvdimm_ns.c \
 	nvdimm_spa.c
 
 SRCS+=	acpi_if.h bus_if.h device_if.h
+SRCS+=	opt_acpi.h opt_ddb.h
 
 .include <bsd.kmod.mk>
Index: stable/12/sys/modules/tpm/Makefile
===================================================================
--- stable/12/sys/modules/tpm/Makefile	(revision 350061)
+++ stable/12/sys/modules/tpm/Makefile	(revision 350062)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 .PATH:	${SRCTOP}/sys/dev/tpm
 
 KMOD=	tpm
 
 SRCS=	tpm.c bus_if.h device_if.h
 #Bus specific stuff.
 SRCS+=	tpm_isa.c tpm_acpi.c isa_if.h opt_acpi.h acpi_if.h
 #TPM 2.0
-SRCS+=	tpm20.c tpm_crb.c tpm_tis.c
+SRCS+=	tpm20.c tpm_crb.c tpm_tis.c opt_tpm.h
 
 .include <bsd.kmod.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 350061)
+++ stable/12	(revision 350062)

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