diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-12 11:42:00 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-12 11:42:00 -0300 |
| commit | 7341f15f7754dbf4f2ae475a18fb5c7157f402b2 (patch) | |
| tree | 44dcf75c5417b7b248152b07452e6af64fa28931 /sys/modules | |
| parent | fa098ef31c4cf4ddab63aced6553fef24c185eea (diff) | |
| parent | e1f3bcd2fa2b9b7fbcd4aa505a65089f15e05577 (diff) | |
| download | FreeBSD-src-7341f15f7754dbf4f2ae475a18fb5c7157f402b2.zip FreeBSD-src-7341f15f7754dbf4f2ae475a18fb5c7157f402b2.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/hyperv/netvsc/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/hyperv/storvsc/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/hyperv/utilities/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/hyperv/vmbus/Makefile | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile index 857df82..f28a59c 100644 --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -1,12 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/netvsc +.PATH: ${.CURDIR}/../../../dev/hyperv/netvsc \ + ${.CURDIR}/../../../dev/hyperv/vmbus KMOD= hv_netvsc SRCS= hv_net_vsc.c \ hv_netvsc_drv_freebsd.c \ hv_rndis_filter.c -SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h +SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h vmbus_if.h CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/netvsc diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile index f39894c..5f38b13 100644 --- a/sys/modules/hyperv/storvsc/Makefile +++ b/sys/modules/hyperv/storvsc/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/storvsc +.PATH: ${.CURDIR}/../../../dev/hyperv/storvsc \ + ${.CURDIR}/../../../dev/hyperv/vmbus \ KMOD= hv_storvsc SRCS = hv_storvsc_drv_freebsd.c \ hv_vstorage.h -SRCS+= bus_if.h device_if.h opt_cam.h +SRCS+= bus_if.h device_if.h opt_cam.h vmbus_if.h CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ -I${.CURDIR}/../../../dev/hyperv/vmbus \ diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile index c1b6d4f..290bd27 100644 --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -4,7 +4,7 @@ KMOD= hv_utils SRCS= hv_util.c hv_kvp.c hv_timesync.c hv_shutdown.c hv_heartbeat.c -SRCS+= bus_if.h device_if.h +SRCS+= bus_if.h device_if.h vmbus_if.h CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ -I${.CURDIR}/../../../dev/hyperv/vmbus diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index 6dfec94..ea7154f 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -4,16 +4,14 @@ ${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH} KMOD= hv_vmbus -SRCS= hv_channel.c \ - hv_channel_mgmt.c \ - hv_connection.c \ - hv_ring_buffer.c \ - hyperv.c \ +SRCS= hyperv.c \ hyperv_busdma.c \ hyperv_machdep.c \ vmbus.c \ + vmbus_br.c \ + vmbus_chan.c \ vmbus_et.c -SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h +SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h vmbus_if.h # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h |
