diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-06-30 13:24:42 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-06-30 13:24:42 -0500 |
| commit | 9d5ffb47ff56597309eb2939cc97b1df4d616797 (patch) | |
| tree | b34fd92dce8092bb4cb58c875caabd93e1fece39 /sys/modules | |
| parent | 1fc6b0207cc2f3cce33817706603caa41a9de24d (diff) | |
| parent | 13295f52fb5936b237a994e75311fe18612c73c4 (diff) | |
| download | FreeBSD-src-9d5ffb47ff56597309eb2939cc97b1df4d616797.zip FreeBSD-src-9d5ffb47ff56597309eb2939cc97b1df4d616797.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/hyperv/vmbus/Makefile | 13 | ||||
| -rw-r--r-- | sys/modules/netgraph/mppc/Makefile | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9d075d1..c26e560 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -110,7 +110,7 @@ SUBDIR= \ fdc \ fdescfs \ ${_fe} \ - ${_filemon} \ + filemon \ firewire \ firmware \ fuse \ @@ -388,7 +388,6 @@ SUBDIR= \ zlib \ .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_filemon= filemon _imgact_binmisc= imgact_binmisc _vmware= vmware .endif diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index 8187146..6dfec94 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -7,20 +7,21 @@ KMOD= hv_vmbus SRCS= hv_channel.c \ hv_channel_mgmt.c \ hv_connection.c \ - hv_et.c \ - hv_hv.c \ hv_ring_buffer.c \ - hv_vmbus_drv_freebsd.c \ - hv_vmbus_priv.h + hyperv.c \ + hyperv_busdma.c \ + hyperv_machdep.c \ + vmbus.c \ + vmbus_et.c SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h SRCS+= assym.s \ - hv_vector.S + vmbus_vector.S -hv_vector.o: +vmbus_vector.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile index 40b3717..1ab69e6 100644 --- a/sys/modules/netgraph/mppc/Makefile +++ b/sys/modules/netgraph/mppc/Makefile @@ -4,11 +4,10 @@ KMOD= ng_mppc SRCS= ng_mppc.c opt_netgraph.h -NETGRAPH_MPPC_COMPRESSION?= 0 +NETGRAPH_MPPC_COMPRESSION?= 1 NETGRAPH_MPPC_ENCRYPTION?= 1 .if ${NETGRAPH_MPPC_COMPRESSION} > 0 -# XXX These files don't exist yet, but hopefully someday they will... .PATH: ${.CURDIR}/../../../net SRCS+= mppcc.c mppcd.c .endif |
