diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-19 12:29:52 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-19 12:29:52 -0200 |
| commit | eb2387fb3f25275b8ca223e3c464563294982bde (patch) | |
| tree | 4c047a938698e448ca596afa45d79a8c2e1bb319 /sys/modules | |
| parent | 7341f15f7754dbf4f2ae475a18fb5c7157f402b2 (diff) | |
| parent | 3254cfb368aca6150ed96b41feb16dc4b0b76194 (diff) | |
| download | FreeBSD-src-eb2387fb3f25275b8ca223e3c464563294982bde.zip FreeBSD-src-eb2387fb3f25275b8ca223e3c464563294982bde.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/hyperv/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/hyperv/stordisengage/Makefile | 9 | ||||
| -rw-r--r-- | sys/modules/hyperv/vmbus/Makefile | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile index 25b32e3..3bae26a 100644 --- a/sys/modules/hyperv/Makefile +++ b/sys/modules/hyperv/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = vmbus netvsc stordisengage storvsc utilities +SUBDIR = vmbus netvsc storvsc utilities .include <bsd.subdir.mk> diff --git a/sys/modules/hyperv/stordisengage/Makefile b/sys/modules/hyperv/stordisengage/Makefile deleted file mode 100644 index 497deb98..0000000 --- a/sys/modules/hyperv/stordisengage/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../../dev/hyperv/stordisengage - -KMOD= hv_ata_pci_disengage -SRCS= hv_ata_pci_disengage.c -SRCS+= ata_if.h bus_if.h device_if.h pci_if.h - -.include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index ea7154f..462557c 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -10,7 +10,9 @@ SRCS= hyperv.c \ vmbus.c \ vmbus_br.c \ vmbus_chan.c \ - vmbus_et.c + vmbus_et.c \ + vmbus_if.c \ + vmbus_xact.c SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h vmbus_if.h # XXX: for assym.s |
