24 files changed, 16 insertions, 20 deletions

diff --git a/sys/contrib/dev/hyperv/README b/sys/dev/hyperv/README
index 1c4488d5c870..1c4488d5c870 100644
--- a/sys/contrib/dev/hyperv/README
+++ b/sys/dev/hyperv/README
diff --git a/sys/contrib/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 36512698fa7d..36512698fa7d 100644
--- a/sys/contrib/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.c b/sys/dev/hyperv/netvsc/hv_net_vsc.c
index aeee94d83459..aeee94d83459 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.c
+++ b/sys/dev/hyperv/netvsc/hv_net_vsc.c
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.h b/sys/dev/hyperv/netvsc/hv_net_vsc.h
index f7e7d00a903f..f7e7d00a903f 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_net_vsc.h
+++ b/sys/dev/hyperv/netvsc/hv_net_vsc.h
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index 47f48dd6abde..47f48dd6abde 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis.h b/sys/dev/hyperv/netvsc/hv_rndis.h
index 819cab5a7290..819cab5a7290 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_rndis.h
+++ b/sys/dev/hyperv/netvsc/hv_rndis.h
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.c b/sys/dev/hyperv/netvsc/hv_rndis_filter.c
index 691cf7ed51b3..691cf7ed51b3 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.c
+++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.c
diff --git a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.h b/sys/dev/hyperv/netvsc/hv_rndis_filter.h
index edbb3476b32f..edbb3476b32f 100644
--- a/sys/contrib/dev/hyperv/netvsc/hv_rndis_filter.h
+++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.h
diff --git a/sys/contrib/dev/hyperv/stordisengage/hv_ata_pci_disengage.c b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
index 2fdf9d49d29e..2fdf9d49d29e 100644
--- a/sys/contrib/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
+++ b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
diff --git a/sys/contrib/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index c89f42e0feea..c89f42e0feea 100644
--- a/sys/contrib/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
diff --git a/sys/contrib/dev/hyperv/storvsc/hv_vstorage.h b/sys/dev/hyperv/storvsc/hv_vstorage.h
index d01d08411471..d01d08411471 100644
--- a/sys/contrib/dev/hyperv/storvsc/hv_vstorage.h
+++ b/sys/dev/hyperv/storvsc/hv_vstorage.h
diff --git a/sys/contrib/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c
index 9ad4370285ff..9ad4370285ff 100644
--- a/sys/contrib/dev/hyperv/utilities/hv_util.c
+++ b/sys/dev/hyperv/utilities/hv_util.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_channel.c b/sys/dev/hyperv/vmbus/hv_channel.c
index 17dfd7611235..17dfd7611235 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_channel.c
+++ b/sys/dev/hyperv/vmbus/hv_channel.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_channel_mgmt.c b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
index 011e305709e6..011e305709e6 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_channel_mgmt.c
+++ b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_connection.c b/sys/dev/hyperv/vmbus/hv_connection.c
index c8e0b48ac65c..c8e0b48ac65c 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_connection.c
+++ b/sys/dev/hyperv/vmbus/hv_connection.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hv_hv.c
index 0e73bdc4bf4e..0e73bdc4bf4e 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_hv.c
+++ b/sys/dev/hyperv/vmbus/hv_hv.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_ring_buffer.c b/sys/dev/hyperv/vmbus/hv_ring_buffer.c
index f7c1965c8334..f7c1965c8334 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_ring_buffer.c
+++ b/sys/dev/hyperv/vmbus/hv_ring_buffer.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
index e0103081ee77..e0103081ee77 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
diff --git a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_priv.h b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
index 739acb158dfc..739acb158dfc 100644
--- a/sys/contrib/dev/hyperv/vmbus/hv_vmbus_priv.h
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile
index 900c1a0b1be7..cf8982672754 100644
--- a/sys/modules/hyperv/netvsc/Makefile
+++ b/sys/modules/hyperv/netvsc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/netvsc
+.PATH:  ${.CURDIR}/../../../dev/hyperv/netvsc
 
 KMOD    = hv_netvsc
 
@@ -9,7 +9,6 @@ SRCS    = hv_net_vsc.c \
 	  hv_rndis_filter.c
 
 CFLAGS 	+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	   -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc \
-	   -I${.CURDIR}/../../../contrib
+	   -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/stordisengage/Makefile b/sys/modules/hyperv/stordisengage/Makefile
index 0f3a6801108d..41e359e09520 100644
--- a/sys/modules/hyperv/stordisengage/Makefile
+++ b/sys/modules/hyperv/stordisengage/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/stordisengage
+.PATH:  ${.CURDIR}/../../../dev/hyperv/stordisengage
 
 KMOD=	 hv_ata_pci_disengage
 
-SRCS =	hv_ata_pci_disengage.c
+SRCS=	hv_ata_pci_disengage.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile
index da98a6ec0d39..5d19884a3469 100644
--- a/sys/modules/hyperv/storvsc/Makefile
+++ b/sys/modules/hyperv/storvsc/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/storvsc
+.PATH:  ${.CURDIR}/../../../dev/hyperv/storvsc
 
 KMOD=	 hv_storvsc
 
 SRCS =	hv_storvsc_drv_freebsd.c \
 	hv_vstorage.h
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus	\
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/storvsc \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus	\
+	 -I${.CURDIR}/../../../dev/hyperv/storvsc
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index 388182cedd5b..e2351a348c71 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+.PATH:	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	 hv_utils
 
 SRCS =  hv_util.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile
index ab5a6eafb104..df8464e02174 100644
--- a/sys/modules/hyperv/vmbus/Makefile
+++ b/sys/modules/hyperv/vmbus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+.PATH:	${.CURDIR}/../../../dev/hyperv/vmbus \
+	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	 hv_vmbus
 
@@ -13,9 +13,8 @@ SRCS =  hv_channel.c \
 	hv_vmbus_drv_freebsd.c \
 	hv_vmbus_priv.h
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/utilities \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus \
+	 -I${.CURDIR}/../../../dev/hyperv/utilities
 
 .include <bsd.kmod.mk>